* config/sparc/xm-sun4os4.h [__STDC__]: Don't use MALLOC_INCOMPATIBLE.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8affb51babecb2bbc91cecb2ae23c215253d3076..fbae261b4207433eeb539058cf255b629a20ec70 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+Wed Apr 28 06:11:38 1993  Jim Kingdon  (kingdon@cygnus.com)
+
+       * config/sparc/xm-sun4os4.h [__STDC__]: Don't use MALLOC_INCOMPATIBLE.
+
 Wed Apr 28 11:39:18 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
 
        * doc/gdb.texinfo: make node "Shell Commands" unconditional;

diff --git a/gdb/config/sparc/xm-sun4os4.h b/gdb/config/sparc/xm-sun4os4.h
index 435066e19fc0e99c0d4b5203a1e2e9f16e9507e9..db2c8151893d556bcd63ce049cd5e4c1f5f68b8a 100644 (file)
--- a/gdb/config/sparc/xm-sun4os4.h
+++ b/gdb/config/sparc/xm-sun4os4.h
@@ -41,6 +41,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 */
 
+#ifndef __STDC__
+/* GCC (2.3-ish at least) fixes this in fixincludes.  */
+/* /usr/include/malloc.h is included by vx-share/xdr_ld.  */
 /* /usr/include/malloc.h defines these w/o prototypes (and uses
    char * instead of void *).  */
 #define MALLOC_INCOMPATIBLE
@@ -49,6 +52,7 @@ extern char* realloc ();
 /* Yes, it really does define it as returning int, both in malloc.h and
    stdlib.h, at least on SunOS 4.1.1.  */
 extern int free ();
+#endif
 
 /* SunOS 4.x uses nonstandard "char *" as type of third argument to ptrace() */