From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 18 Apr 2001 10:26:16 +0000 (+0000)
Subject: (__malloc_size_t) [__GNUC__]: If STDC_HEADERS is not
X-Git-Tag: emacs-pretest-21.0.103~189
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eec2d1ded9283af334077f9334ed939bb7268140;p=emacs.git

(__malloc_size_t) [__GNUC__]: If STDC_HEADERS is not
defined, include stddef.h and use __SIZE_TYPE__ instead of size_t.
(__memalign_hook): Make the two prototypes consistent.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 90938a19f6d..1f57bf8a3a3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* gmalloc.c (__malloc_size_t) [__GNUC__]: If STDC_HEADERS is not
+	defined, include stddef.h and use __SIZE_TYPE__ instead of size_t.
+	(__memalign_hook): Make the two prototypes consistent.
+
 2001-04-17  Gerd Moellmann  <gerd@gnu.org>
 
 	* xdisp.c (redisplay_window): Make sure to clear the desired glyph
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 3508304da33..598d802badc 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -84,7 +84,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 +1605,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)