From fa128a27abf9f71131b174db2e06586486da2a25 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Wed, 8 Apr 1992 05:17:56 +0000 Subject: [PATCH] Only redefine size_t and CHAR_BIT if they are not already defined. --- mmalloc/ChangeLog | 5 +++++ mmalloc/mmalloc.h | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mmalloc/ChangeLog b/mmalloc/ChangeLog index 383f2fe..6facb66 100644 --- a/mmalloc/ChangeLog +++ b/mmalloc/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 7 22:16:09 1992 Fred Fish (fnf@cygnus.com) + + * mmalloc.h (size_t, CHAR_BIT): Only redefine if not already + defined. + Mon Apr 6 20:49:33 1992 Fred Fish (fnf@cygnus.com) * mmalloc.h: Remove include of . This also gets rid diff --git a/mmalloc/mmalloc.h b/mmalloc/mmalloc.h index b067726..030cdc2 100644 --- a/mmalloc/mmalloc.h +++ b/mmalloc/mmalloc.h @@ -36,12 +36,15 @@ Cambridge, MA 02139, USA. # define NULL (void *) 0 # endif #else -# undef size_t -# define size_t unsigned int -# define CHAR_BIT 8 # define PTR char * # define CONST /* nothing */ # define PARAMS(paramlist) () +# ifndef size_t +# define size_t unsigned int +# endif +# ifndef CHAR_BIT +# define CHAR_BIT 8 +# endif # ifndef NULL # define NULL 0 # endif -- 2.7.4