aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorFred Fish <fnf@specifix.com>1995-09-11 23:41:45 +0000
committerFred Fish <fnf@specifix.com>1995-09-11 23:41:45 +0000
commit031c4a7eed4d66297620a9b2d7b695d9e041de50 (patch)
tree66055950722d9379943f1544ce3ae0b198b7bfab /gdb
parent812e4a9bc2f0eb98a5de04a3c269bcd66896b95a (diff)
downloadgdb-031c4a7eed4d66297620a9b2d7b695d9e041de50.zip
gdb-031c4a7eed4d66297620a9b2d7b695d9e041de50.tar.gz
gdb-031c4a7eed4d66297620a9b2d7b695d9e041de50.tar.bz2
* defs.h: Only include mmalloc.h if NO_MMALLOC is not
defined.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/defs.h14
2 files changed, 19 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2129a32..7c7f21b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 10 15:36:21 1995 Fred Fish <fnf@cygnus.com>
+
+ * defs.h: Only include mmalloc.h if NO_MMALLOC is not
+ defined.
+
Sun Sep 10 10:24:48 1995 Michael Tiemann <tiemann@axon.cygnus.com>
* tm-ppc-eabi.h (PC_IN_CALL_DUMMY): Redefine this to work with the
diff --git a/gdb/defs.h b/gdb/defs.h
index b188828..dfd63af 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -41,7 +41,9 @@ extern char *strsignal PARAMS ((int));
#include "progress.h"
+#ifndef NO_MMALLOC
#include "mmalloc.h"
+#endif
/* For BFD64 and bfd_vma. */
#include "bfd.h"
@@ -640,17 +642,29 @@ extern void free ();
#endif /* MALLOC_INCOMPATIBLE */
#ifndef WIN32
+
+#ifndef strchr
extern char *strchr ();
+#endif
+#ifndef strrchr
extern char *strrchr ();
+#endif
+#ifndef strstr
extern char *strstr ();
+#endif
+#ifndef strtok
extern char *strtok ();
+#endif
+#ifndef strerror
extern char *strerror ();
#endif
+#endif /* !WIN32 */
+
/* Various possibilities for alloca. */
#ifndef alloca
# ifdef __GNUC__