diff src/gmalloc.c @ 100:4be1180a9e89 r20-1b2

Import from CVS: tag r20-1b2
author cvs
date Mon, 13 Aug 2007 09:15:11 +0200
parents 821dec489c24
children 3d6bfa290dbd
line wrap: on
line diff
--- a/src/gmalloc.c	Mon Aug 13 09:13:58 2007 +0200
+++ b/src/gmalloc.c	Mon Aug 13 09:15:11 2007 +0200
@@ -98,7 +98,7 @@
 
 /* #### XEmacs change for Solaris */
 #if defined (__cplusplus) || (defined (__STDC__) && __STDC__) || \
-    (defined (__STDC__) && defined (SOLARIS2))
+    (defined (__STDC__) && defined (SOLARIS2)) || defined (WINDOWSNT)
 #undef	__P
 #define	__P(args)	args
 #undef	__ptr_t
@@ -351,7 +351,9 @@
 #if defined (__GNU_LIBRARY__) || defined (_LIBC)
 #include <stddef.h>
 #include <sys/cdefs.h>
+#if ! (defined (__GLIBC__) && (__GLIBC__ >= 2))
 extern size_t __getpagesize __P ((void));
+#endif
 #else
 #include "getpagesize.h"
 #define	 __getpagesize()	getpagesize()