1.1 --- a/core/sourcehook/sh_pagealloc.h Sun Nov 22 23:54:55 2009 -0600
1.2 +++ b/core/sourcehook/sh_pagealloc.h Tue Nov 24 07:19:57 2009 -0600
1.3 @@ -1,9 +1,9 @@
1.4 #ifndef __SH_PAGEALLOC_H__
1.5 #define __SH_PAGEALLOC_H__
1.6
1.7 -# if /********/ defined _WIN32
1.8 +# if SH_XP == SH_XP_WINAPI
1.9 # include <windows.h>
1.10 -# elif /******/ defined __linux__
1.11 +# elif SH_XP == SH_XP_POSIX
1.12 # include <sys/mman.h>
1.13 # include <unistd.h>
1.14 # else
1.15 @@ -140,9 +140,9 @@
1.16
1.17 void FreeRegion()
1.18 {
1.19 -#ifdef __linux__
1.20 +#if SH_XP == SH_XP_POSIX
1.21 munmap(startPtr, size);
1.22 -#else
1.23 +#elif SH_XP == SH_XP_WINAPI
1.24 VirtualFree(startPtr, 0, MEM_RELEASE);
1.25 #endif
1.26 }
1.27 @@ -167,9 +167,12 @@
1.28 if (newRegion.size < minSize)
1.29 newRegion.size += m_PageSize;
1.30
1.31 -#ifdef __linux__
1.32 +#if SH_XP == SH_XP_POSIX
1.33 +# if !defined MAP_ANONYMOUS
1.34 +# define MAP_ANONYMOUS MAP_ANON
1.35 +# endif
1.36 newRegion.startPtr = mmap(0, newRegion.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
1.37 -#else
1.38 +#elif SH_XP == SH_XP_WINAPI
1.39 newRegion.startPtr = VirtualAlloc(NULL, newRegion.size, MEM_COMMIT, PAGE_READWRITE);
1.40 #endif
1.41
1.42 @@ -209,9 +212,9 @@
1.43 public:
1.44 CPageAlloc(size_t minAlignment = 1 /* power of 2 */ ) : m_MinAlignment(minAlignment)
1.45 {
1.46 -#ifdef __linux__
1.47 +#if SH_XP == SH_XP_POSIX
1.48 m_PageSize = sysconf(_SC_PAGESIZE);
1.49 -#else
1.50 +#elif SH_XP == SH_XP_WINAPI
1.51 SYSTEM_INFO sysInfo;
1.52 GetSystemInfo(&sysInfo);
1.53 m_PageSize = sysInfo.dwPageSize;