Mercurial > hg > xemacs-beta

diff src/gmalloc.c @ 272:c5d627a313b1 r21-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 084402c475ba
children c42ec1d1cded
line wrap: on
line diff
--- a/src/gmalloc.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/gmalloc.c	Mon Aug 13 10:28:48 2007 +0200
@@ -78,11 +78,7 @@
 #endif
 #endif
 
-#if	defined(__GNU_LIBRARY__) || defined(__STDC__)
 #include <limits.h>
-#else
-#define	CHAR_BIT	8
-#endif
 
 #ifdef	HAVE_UNISTD_H
 #include <unistd.h>
@@ -96,32 +92,13 @@
 {
 #endif
 
-/* #### XEmacs change for Solaris */
-#if defined (__cplusplus) || (defined (__STDC__) && __STDC__) || \
-    (defined (__STDC__) && defined (SOLARIS2)) || defined (WINDOWSNT)
 #undef	__P
 #define	__P(args)	args
 #undef	__ptr_t
 #define	__ptr_t		void *
-#else /* Not C++ or ANSI C.  */
-#undef	__P
-#define	__P(args)	()
-#undef	const
-#define	const
-#undef	__ptr_t
-#define	__ptr_t		char *
-#endif /* C++ or ANSI C.  */
 
-#ifdef	__STDC__
 #include <stddef.h>
 #define	__malloc_size_t	size_t
-#else
-#ifdef OSF1		/* from grunwald@foobar.cs.colorado.edu */
-#define __malloc_size_t unsigned long
-#else
-#define	__malloc_size_t	unsigned int
-#endif
-#endif
 
 #ifndef	NULL
 #define	NULL	0