2002-08-20 Casper S. Hornstrup <chorns@users.sourceforge.net>

        * libc/stdlib/mallocr.c: #include windows.h on Win32.
          (AlignPage): Continue macro on next line.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 3a9cf29..a383528 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-20  Casper S. Hornstrup  <chorns@users.sourceforge.net>
+
+        * libc/stdlib/mallocr.c: #include windows.h on Win32.
+          (AlignPage): Continue macro on next line.
+
 2002-08-19  Jeff Johnston  <jjohnstn@redhat.com>
 
        * libc/sys/linux/include/pthread.h: New file.

diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c
index 89838f6..b4fa555 100644 (file)
--- a/newlib/libc/stdlib/mallocr.c
+++ b/newlib/libc/stdlib/mallocr.c
@@ -273,6 +273,10 @@ extern "C" {
 #include <stdio.h>    /* needed for malloc_stats */
 #include <limits.h>   /* needed for overflow checks */
 
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 
 /*
   Compile-time options
@@ -1077,7 +1081,7 @@ struct mallinfo mALLINFo();
 
 #ifdef WIN32
 
-#define AlignPage(add) (((add) + (malloc_getpagesize-1)) &
+#define AlignPage(add) (((add) + (malloc_getpagesize-1)) & \
 ~(malloc_getpagesize-1))
 
 /* resrve 64MB to insure large contiguous space */