Only redefine size_t and CHAR_BIT if they are not already defined.

diff --git a/mmalloc/ChangeLog b/mmalloc/ChangeLog
index 383f2fe5cf8fb47a64e34fe41d95526fe366a893..6facb665b7045970462b17b0024feff6e23eaa37 100644 (file)
--- 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 <stdlib.h>.  This also gets rid

diff --git a/mmalloc/mmalloc.h b/mmalloc/mmalloc.h
index b06772650bc89343f9d4545c35c056996715645c..030cdc2bfd8f198a03521bb23635712dd7756806 100644 (file)
--- 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