* xcoffexec.c: Remove ' from comment.

* xm-sun3os4.h:  Define MALLOC_INCOMPATIBLE to avoid conflicts
with decls of malloc in c-exp.tab.c (as produced by yacc).
There's got to be a better way to do this...

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1fec6e373d26f22ca6e299072ce681e7afd73083..1db763949152dc607ad836f93312127a90ea4507 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 17 13:08:33 1992  Stu Grossman  (grossman at cygnus.com)
+
+       * xcoffexec.c:  Remove ' from comment.
+
+       * xm-sun3os4.h:  Define MALLOC_INCOMPATIBLE to avoid conflicts
+       with decls of malloc in c-exp.tab.c (as produced by yacc).
+       There's got to be a better way to do this...
+
 Wed Jun 17 11:10:40 1992  Fred Fish  (fnf@cygnus.com)
 
        * partial-stab.h: Convert single rindex use to strrchr.

diff --git a/gdb/xcoffexec.c b/gdb/xcoffexec.c
index 42ed759ed0e3133363d25e1ed15aa8437caf52d7..f9b9e3238f28c28e5033d3b8e1c2e76923ded693 100644 (file)
--- a/gdb/xcoffexec.c
+++ b/gdb/xcoffexec.c
@@ -342,7 +342,7 @@ map_vmap (bfd *bf, bfd *arch)
 #if 0
     /* This is only needed if we want to load shared libraries no matter what.
        Since we provide the choice of incremental loading of shared objects
-       now, we don't have to load them as default anymore. */
+       now, we do not have to load them as default anymore. */
     
     syms_from_objfile (obj, 0, 0, 0);
     new_symfile_objfile (obj, 0, 0);

diff --git a/gdb/xm-sun3os4.h b/gdb/xm-sun3os4.h
index b9401f97f5386bae0919b544efbabe756a946308..cf23a4b0a5f4cd5efb870aa067466e639308f198 100644 (file)
--- a/gdb/xm-sun3os4.h
+++ b/gdb/xm-sun3os4.h
@@ -40,3 +40,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define MMAP_BASE_ADDRESS      0xE0000000      /* First mapping here */
 #define MMAP_INCREMENT         0x01000000      /* Increment to next mapping */
+
+/* Prevent type conflicts between yacc malloc decls and defs.h */
+#define MALLOC_INCOMPATIBLE
+extern char *malloc();
+extern char *realloc();
+extern void free();