aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJim Kingdon <jkingdon@engr.sgi.com>1993-04-28 19:17:50 +0000
committerJim Kingdon <jkingdon@engr.sgi.com>1993-04-28 19:17:50 +0000
commit08bb26176655f29ff633b2d44d07ffe833d90fa5 (patch)
treea85048c362c44d601b5a1e6bde3957f2d718059a /gdb
parentcaa53d6d61a0a9a6008e24a71d528594bed4799f (diff)
downloadgdb-08bb26176655f29ff633b2d44d07ffe833d90fa5.zip
gdb-08bb26176655f29ff633b2d44d07ffe833d90fa5.tar.gz
gdb-08bb26176655f29ff633b2d44d07ffe833d90fa5.tar.bz2
* config/sparc/xm-sun4os4.h [__STDC__]: Don't use MALLOC_INCOMPATIBLE.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/config/sparc/xm-sun4os4.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8affb51..fbae261 100644
--- 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 435066e..db2c815 100644
--- 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() */