Alexandre Julliard : kernel: Added support for GlobalMemoryStatus on
MacOS.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jun 9 11:16:18 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 9aea3b2d31037a22bed5869e669c15b8fe5f6675
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9aea3b2d31037a22bed5869e669c15b8fe5f6675
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jun 9 11:52:50 2006 +0200
kernel: Added support for GlobalMemoryStatus on MacOS.
---
dlls/kernel/heap.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c
index 7e7625c..06f6aa2 100644
--- a/dlls/kernel/heap.c
+++ b/dlls/kernel/heap.c
@@ -1171,13 +1171,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMO
SYSTEM_INFO si;
#ifdef linux
FILE *f;
-#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- int *tmp;
- int size_sys;
- int mib[2] = { CTL_HW };
-#endif
-#ifdef sun
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ int *tmp, size_sys, mib[2];
+#elif defined(__APPLE__)
+ int *tmp, mib[2];
+ size_t size_sys;
+#elif defined(sun)
long pagesize,maxpages,freepages,swapspace,swapfree;
struct anoninfo swapinf;
int rval;
@@ -1243,7 +1242,8 @@ #ifdef linux
/ (TotalPhysical / 100);
}
}
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__)
+ mib[0] = CTL_HW;
mib[1] = HW_PHYSMEM;
sysctl(mib, 2, NULL, &size_sys, NULL, 0);
tmp = malloc(size_sys * sizeof(int));
More information about the wine-cvs
mailing list