Added mouse-highlight variable to turn off mouse highlight or

[bpt/emacs.git] / src / gmalloc.c

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 3508304..77fb319 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
@@ -84,7 +85,15 @@ extern "C"
 #define        __malloc_size_t         size_t
 #define        __malloc_ptrdiff_t      ptrdiff_t
 #else
+#ifdef __GNUC__
+#include <stddef.h>
+#ifdef __SIZE_TYPE__
+#define        __malloc_size_t         __SIZE_TYPE__
+#endif
+#endif
+#ifndef __malloc_size_t
 #define        __malloc_size_t         unsigned int
+#endif
 #define        __malloc_ptrdiff_t      int
 #endif
 
@@ -1597,7 +1606,8 @@ Cambridge, MA 02139, USA.  */
 
 #else
 
-__ptr_t (*__memalign_hook) PP ((size_t __size, size_t __alignment));
+__ptr_t (*__memalign_hook) PP ((__malloc_size_t __size,
+                               __malloc_size_t __alignment));
 
 __ptr_t
 memalign (alignment, size)