Ken Thomases : kernel32: Consolidate some duplicate variable declarations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 69531892713f6ad4e375e63f4e95a99d96ebdcca
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=69531892713f6ad4e375e63f4e95a99d96ebdcca

Author: Ken Thomases <ken at codeweavers.com>
Date:   Sun Feb 16 20:43:35 2014 -0600

kernel32: Consolidate some duplicate variable declarations.

---

 dlls/kernel32/heap.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index 8d4325a..c88d31c 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -1146,12 +1146,12 @@ BOOL WINAPI GlobalMemoryStatusEx( LPMEMORYSTATUSEX lpmemex )
     SYSTEM_INFO si;
 #ifdef linux
     FILE *f;
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-    unsigned long val;
-    int mib[2];
-    size_t size_sys;
-#elif defined(__APPLE__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
+#ifdef __APPLE__
     unsigned int val;
+#else
+    unsigned long val;
+#endif
     int mib[2];
     size_t size_sys;
 #elif defined(sun)