Test BROKEN_PROTOTYPES.

diff --git a/src/ChangeLog b/src/ChangeLog
index 80136fe8580b405a6d58482818204d0e455f7b92..c3c6ba65479015a3cb6d050377934d8576be778d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-11-04  Richard M. Stallman  <rms@gnu.org>
+
+       * gmalloc.c: Test BROKEN_PROTOTYPES.
+
+       * xfns.c: Include unistd.h, if it exists.
+
+       * editfns.c: Move the include of ctype.h after unistd.h.
+
 2001-11-03  Richard M. Stallman  <rms@gnu.org>
 
        * data.c (Fmake_local_variable): Doc fix.

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 598d802badc8ddfa3a6397ad3cca9cba816e10ed..77fb31971018a5ea67fe87224ed9ba8e25df9588 100644 (file)
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -36,8 +36,9 @@ Cambridge, MA 02139, USA.
 #include <config.h>
 #endif
 
-#if defined __cplusplus || (defined (__STDC__) && __STDC__) || \
-  defined STDC_HEADERS || defined PROTOTYPES
+#if ((defined __cplusplus || (defined (__STDC__) && __STDC__) \
+      || defined STDC_HEADERS || defined PROTOTYPES) \
+     && ! defined (BROKEN_PROTOTYPES))
 #undef PP
 #define        PP(args)        args
 #undef __ptr_t