From 645bb44eb44273c4cac6a06d25cd348c05eb6deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Tue, 9 Aug 2016 00:06:10 +0200
Subject: [PATCH] Minor fixes to 64 bit builds

---
 CMakeLists.txt | 2 +-
 src/openrct2.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a29aab1011..368d6b61db 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -294,7 +294,7 @@ if (WIN32)
 else (WIN32)
 	add_executable(${PROJECT} ${ORCT2_SOURCES} ${ORCT2_MM_SOURCES} ${RCT2_SECTIONS})
 	add_dependencies(${PROJECT} segfiles)
-	if (NOT APPLE)
+	if (NOT APPLE AND NOT USE_MMAP)
 		add_dependencies(${PROJECT} linkable_sections)
 	endif ()
 	add_custom_command(
diff --git a/src/openrct2.c b/src/openrct2.c
index aa48ee58a9..01f947d57a 100644
--- a/src/openrct2.c
+++ b/src/openrct2.c
@@ -560,7 +560,7 @@ bool openrct2_setup_rct2_segment()
 	int numPages = (len + pageSize - 1) / pageSize;
 	unsigned char *dummy = malloc(numPages);
 
-	err = mincore((void *)0x8a4000, len, dummy);
+	err = mincore((void *)segments, len, dummy);
 	bool pagesMissing = false;
 	if (err != 0)
 	{
@@ -582,8 +582,8 @@ bool openrct2_setup_rct2_segment()
 			if (dummy[i] != 1)
 			{
 				pagesMissing = true;
-				void *start = (void *)0x8a4000 + i * pageSize;
-				void *end = (void *)0x8a4000 + (i + 1) * pageSize - 1;
+				void *start = (void *)segments + i * pageSize;
+				void *end = (void *)segments + (i + 1) * pageSize - 1;
 				log_warning("required page %p - %p is not in memory!", start, end);
 			}
 		}
@@ -602,7 +602,7 @@ bool openrct2_setup_rct2_segment()
 	}
 #endif // !defined(USE_MMAP)
 	// section: rw data
-	err = mprotect((void *)0x8a4000, 0x01429000 - 0x8a4000, PROT_READ | PROT_WRITE);
+	err = mprotect((void *)segments, 0x01429000 - 0x8a4000, PROT_READ | PROT_WRITE);
 	if (err != 0)
 	{
 		perror("mprotect");