diff options
| author | Stu Grossman <grossman@cygnus> | 1992-06-17 20:15:03 +0000 |
|---|---|---|
| committer | Stu Grossman <grossman@cygnus> | 1992-06-17 20:15:03 +0000 |
| commit | 427d778c2c41b0dadfc7420eba95b963f7c872cc (patch) | |
| tree | feb2da0559f3a944dbf8e1a7767505bc1da47524 /gdb | |
| parent | 5e16788678168d2f1624814d159955e7bc5a2a28 (diff) | |
| download | gdb-427d778c2c41b0dadfc7420eba95b963f7c872cc.zip gdb-427d778c2c41b0dadfc7420eba95b963f7c872cc.tar.gz gdb-427d778c2c41b0dadfc7420eba95b963f7c872cc.tar.bz2 | |
* 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...
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/xcoffexec.c | 2 | ||||
| -rw-r--r-- | gdb/xm-sun3os4.h | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1fec6e3..1db7639 100644 --- 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 42ed759..f9b9e32 100644 --- 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 b9401f9..cf23a4b 100644 --- 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(); |