From e829d98374e0977ca0a51195b6005088a7cc6e00 Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Tue, 16 Mar 1993 18:15:25 +0000 Subject: [PATCH] * config/rs6000.mh: Get rid of -Dfd_set=int crock. This is defined in defs.h if necessary. * vx-share/vxWorks.h: Remove #defs of min and max. * vx-share/xdr_ld.c, vx-share/xdr_ptrace.c, vx-share/xdr_rdb.c: include defs.h. --- gdb/ChangeLog | 8 ++++++++ gdb/config/rs6000.mh | 8 -------- gdb/vx-share/vxWorks.h | 4 ---- gdb/vx-share/xdr_ld.c | 1 + gdb/vx-share/xdr_ptrace.c | 1 + gdb/vx-share/xdr_rdb.c | 1 + 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a99bfc7208..6471567f34 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +Tue Mar 16 10:09:05 1993 Stu Grossman (grossman@cygnus.com) + + * config/rs6000.mh: Get rid of -Dfd_set=int crock. + This is defined in defs.h if necessary. + * vx-share/vxWorks.h: Remove #defs of min and max. + * vx-share/xdr_ld.c, vx-share/xdr_ptrace.c, + vx-share/xdr_rdb.c: include defs.h. + Fri Mar 12 09:33:23 1993 Jim Kingdon (kingdon@cygnus.com) * xcoffread.c (retrieve_tracebackinfo): Move assignment out diff --git a/gdb/config/rs6000.mh b/gdb/config/rs6000.mh index 6268571a72..a4037eb115 100644 --- a/gdb/config/rs6000.mh +++ b/gdb/config/rs6000.mh @@ -26,14 +26,6 @@ NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o rs6000-nat.o xcoffread # We have no idea who our current compiler is though, so we skip it. # MH_CFLAGS = -bnodelcsect -# The IBM version of /usr/include/rpc/rpc.h has a bug -- it says -# `extern fd_set svc_fdset;' without ever defining the type fd_set. -# Unfortunately this occurs in the vx-share code, which is not configured -# like the rest of GDB (e.g. it doesn't include "defs.h"). -# We circumvent this bug by #define-ing fd_set here, but undefining it in -# the xm-rs6000.h file before ordinary modules try to use it. FIXME, IBM! -MH_CFLAGS=-Dfd_set=int - # Because of shared libraries, we risk ending up with *two* # incompatible versions of malloc if we use GNU malloc ... MMALLOC_LIB = diff --git a/gdb/vx-share/vxWorks.h b/gdb/vx-share/vxWorks.h index 5a915f654b..8ce167bb86 100644 --- a/gdb/vx-share/vxWorks.h +++ b/gdb/vx-share/vxWorks.h @@ -161,10 +161,6 @@ modification history #define FOREVER for (;;) -#define max(x, y) (((x) < (y)) ? (y) : (x)) -#define min(x, y) (((x) < (y)) ? (x) : (y)) - - /* storage class specifier definitions */ #define FAST register diff --git a/gdb/vx-share/xdr_ld.c b/gdb/vx-share/xdr_ld.c index 3572154ca8..f849505969 100644 --- a/gdb/vx-share/xdr_ld.c +++ b/gdb/vx-share/xdr_ld.c @@ -17,6 +17,7 @@ for object files that are downloaded to VxWorks. They are used by remote debuggers that use RPC (such as dbxWorks and vxGdb). */ +#include "defs.h" #include "vxWorks.h" #include "rpc/rpc.h" #include "xdr_ld.h" diff --git a/gdb/vx-share/xdr_ptrace.c b/gdb/vx-share/xdr_ptrace.c index 3d104643a1..6c9c8a2f3f 100644 --- a/gdb/vx-share/xdr_ptrace.c +++ b/gdb/vx-share/xdr_ptrace.c @@ -13,6 +13,7 @@ modification history 01a,05jun90,llk extracted from xdr_ptrace.h, version 01c. */ +#include "defs.h" #include "vxWorks.h" #include #include "xdr_ptrace.h" diff --git a/gdb/vx-share/xdr_rdb.c b/gdb/vx-share/xdr_rdb.c index cc0e533d9a..0520f7f6e7 100644 --- a/gdb/vx-share/xdr_rdb.c +++ b/gdb/vx-share/xdr_rdb.c @@ -16,6 +16,7 @@ This module contains the eXternal Data Representation (XDR) routines for the RDB interface for VxWorks. */ +#include "defs.h" #include "vxWorks.h" #include #include "xdr_rdb.h" -- 2.34.1