From: Ken Thomases Subject: [PATCH 3/7] kernel32: Consolidate some duplicate variable declarations. Message-Id: <514EBEB1-3F16-402D-B997-B684401D673D@codeweavers.com> Date: Sun, 16 Feb 2014 20:43:35 -0600 --- dlls/kernel32/heap.c | 10 +++++----- 1 files 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)