From 08bb26176655f29ff633b2d44d07ffe833d90fa5 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Wed, 28 Apr 1993 19:17:50 +0000 Subject: [PATCH] * config/sparc/xm-sun4os4.h [__STDC__]: Don't use MALLOC_INCOMPATIBLE. --- gdb/ChangeLog | 4 ++++ gdb/config/sparc/xm-sun4os4.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8affb51babe..fbae261b420 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 435066e19fc..db2c8151893 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() */ -- 2.30.2