summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Fish <fnf@specifix.com>1992-04-08 05:17:56 +0000
committerFred Fish <fnf@specifix.com>1992-04-08 05:17:56 +0000
commitfa128a27abf9f71131b174db2e06586486da2a25 (patch)
tree62825615e05a36286a8570f718d16fcef241beaa
parentff1e35cb62df4179a14a64cbee4c752eb0ba8885 (diff)
downloadbinutils-gdb-fa128a27abf9f71131b174db2e06586486da2a25.tar.gz
Only redefine size_t and CHAR_BIT if they are not already defined.
-rw-r--r--mmalloc/ChangeLog5
-rw-r--r--mmalloc/mmalloc.h9
2 files changed, 11 insertions, 3 deletions
diff --git a/mmalloc/ChangeLog b/mmalloc/ChangeLog
index 383f2fe5cf8..6facb665b70 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 <stdlib.h>. This also gets rid
diff --git a/mmalloc/mmalloc.h b/mmalloc/mmalloc.h
index b06772650bc..030cdc2bfd8 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