* defs.h: Only include mmalloc.h if NO_MMALLOC is not

defined.

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

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__