From fdfa331511ca311293735930c7476593a91ca20a Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Thu, 9 May 1996 21:24:20 +0000 Subject: [PATCH] * Makefile.in, breakpoint.c, corelow.c, fork-child.c, inflow.c, infrun.c, mac-nat.c, procfs.c, remote.c, sol-thread.c, thread.c, win32-nat.c, config/nm-lynx.h: Rename thread.h to gdbthread.h to avoid conflict with Solaris /usr/include/thread.h. --- gdb/.Sanitize | 2 +- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 14 +++++++------- gdb/breakpoint.c | 2 +- gdb/corelow.c | 2 +- gdb/fork-child.c | 2 +- gdb/{thread.h => gdbthread.h} | 6 +++--- gdb/infrun.c | 2 +- gdb/mac-nat.c | 2 +- gdb/procfs.c | 2 +- gdb/sol-thread.c | 2 +- gdb/thread.c | 2 +- gdb/win32-nat.c | 2 +- 13 files changed, 27 insertions(+), 20 deletions(-) rename gdb/{thread.h => gdbthread.h} (96%) diff --git a/gdb/.Sanitize b/gdb/.Sanitize index 62f7431390..b446ac3a35 100644 --- a/gdb/.Sanitize +++ b/gdb/.Sanitize @@ -189,6 +189,7 @@ gdba.el gdbcmd.h gdbcore.h gdbserver +gdbthread.h gdbtypes.c gdbtypes.h gnu-nat.c @@ -369,7 +370,6 @@ target.h terminal.h testsuite thread.c -thread.h top.c top.h typeprint.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 23de2ea200..64bb858e24 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +Thu May 9 14:13:08 1996 Stu Grossman (grossman@critters.cygnus.com) + + * Makefile.in, breakpoint.c, corelow.c, fork-child.c, inflow.c, + infrun.c, mac-nat.c, procfs.c, remote.c, sol-thread.c, thread.c, + win32-nat.c, config/nm-lynx.h: Rename thread.h to gdbthread.h to + avoid conflict with Solaris /usr/include/thread.h. + Thu May 9 12:33:32 1996 Rob Savoye * abug-rom.c: Config file for the older style ABug monitor that diff --git a/gdb/Makefile.in b/gdb/Makefile.in index cd6cf67bff..be49ae5411 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -428,7 +428,7 @@ HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \ nindy-share/env.h nindy-share/stop.h \ vx-share/dbgRpcLib.h vx-share/ptrace.h vx-share/vxTypes.h \ vx-share/vxWorks.h vx-share/wait.h vx-share/xdr_ld.h \ - vx-share/xdr_ptrace.h vx-share/xdr_rdb.h thread.h \ + vx-share/xdr_ptrace.h vx-share/xdr_rdb.h gdbthread.h \ dcache.h remote-utils.h remote-sim.h top.h somsolib.h # Header files that already have srcdir in them, or which are in objdir. @@ -1013,7 +1013,7 @@ blockframe.o: blockframe.c $(defs_h) $(gdbcore_h) $(inferior_h) \ objfiles.h symfile.h target.h breakpoint.o: breakpoint.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \ - $(inferior_h) language.h target.h thread.h gdb_string.h + $(inferior_h) language.h target.h gdbthread.h gdb_string.h buildsym.o: buildsym.c $(bfd_h) buildsym.h complaints.h $(defs_h) \ objfiles.h symfile.h $(symtab_h) gdb_string.h @@ -1084,7 +1084,7 @@ corefile.o: corefile.c $(dis-asm_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \ $(inferior_h) target.h language.h gdb_string.h corelow.o: corelow.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \ - target.h thread.h gdb_string.h + target.h gdbthread.h gdb_string.h cp-valprint.o: cp-valprint.c $(defs_h) $(expression_h) $(gdbcmd_h) \ $(gdbtypes_h) $(symtab_h) $(value_h) gdb_string.h @@ -1127,7 +1127,7 @@ findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \ gdb_string.h fork-child.o: fork-child.c $(wait_h) $(defs_h) $(gdbcore_h) \ - $(inferior_h) target.h terminal.h thread.h gdb_string.h + $(inferior_h) target.h terminal.h gdbthread.h gdb_string.h # start-sanitize-gdbtk gdbtk.o: gdbtk.c $(defs_h) $(symtab_h) $(inferior_h) $(command_h) \ @@ -1192,13 +1192,13 @@ infcmd.o: infcmd.c $(defs_h) environ.h $(gdbcmd_h) $(gdbcore_h) \ $(inferior_h) target.h language.h gdb_string.h inflow.o: inflow.c $(bfd_h) $(command_h) $(defs_h) $(inferior_h) \ - signals.h target.h terminal.h thread.h gdb_string.h + signals.h target.h terminal.h gdbthread.h gdb_string.h infptrace.o: infptrace.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \ gdb_string.h $(wait_h) $(command_h) infrun.o: infrun.c $(wait_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \ - $(inferior_h) target.h thread.h gdb_string.h + $(inferior_h) target.h gdbthread.h gdb_string.h inftarg.o: inftarg.c $(wait_h) $(defs_h) $(gdbcore_h) $(inferior_h) \ target.h terminal.h $(command_h) @@ -1494,7 +1494,7 @@ tahoe-tdep.o: tahoe-tdep.c $(OP_INCLUDE)/tahoe.h $(defs_h) \ target.o: target.c $(bfd_h) $(defs_h) $(gdbcmd_h) $(inferior_h) \ objfiles.h symfile.h target.h gdb_string.h -thread.o: thread.c $(defs_h) thread.h $(gdbcmd_h) +thread.o: thread.c $(defs_h) gdbthread.h $(gdbcmd_h) top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \ $(defs_h) $(gdbcmd_h) $(inferior_h) language.h signals.h \ diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index d9960ed186..54c01b6b46 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "value.h" #include "command.h" #include "inferior.h" -#include "thread.h" +#include "gdbthread.h" #include "target.h" #include "language.h" #include "gdb_string.h" diff --git a/gdb/corelow.c b/gdb/corelow.c index f182e9c5f7..0d01bf03b7 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bfd.h" #include "target.h" #include "gdbcore.h" -#include "thread.h" +#include "gdbthread.h" /* List of all available core_fns. On gdb startup, each core file register reader calls add_core_fns() to register information on each core format it diff --git a/gdb/fork-child.c b/gdb/fork-child.c index 1b00c9320e..243bed4afe 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "wait.h" #include "gdbcore.h" #include "terminal.h" -#include "thread.h" +#include "gdbthread.h" #include #ifdef HAVE_UNISTD_H diff --git a/gdb/thread.h b/gdb/gdbthread.h similarity index 96% rename from gdb/thread.h rename to gdb/gdbthread.h index 6777887af2..33c2b11896 100644 --- a/gdb/thread.h +++ b/gdb/gdbthread.h @@ -20,8 +20,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef THREAD_H -#define THREAD_H +#ifndef GDBTHREAD_H +#define GDBTHREAD_H extern void init_thread_list PARAMS ((void)); @@ -43,4 +43,4 @@ extern void save_infrun_state PARAMS ((int, CORE_ADDR, CORE_ADDR, char *, struct breakpoint *, CORE_ADDR, CORE_ADDR, CORE_ADDR, int, int)); -#endif /* THREAD_H */ +#endif /* GDBTHREAD_H */ diff --git a/gdb/infrun.c b/gdb/infrun.c index ee41c09481..0089b7ef78 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "gdbcore.h" #include "gdbcmd.h" #include "target.h" -#include "thread.h" +#include "gdbthread.h" #include "annotate.h" #include diff --git a/gdb/mac-nat.c b/gdb/mac-nat.c index bdf6c6df2c..f827fca66f 100644 --- a/gdb/mac-nat.c +++ b/gdb/mac-nat.c @@ -33,7 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include #include "buildsym.h" #include "gdb_string.h" -#include "thread.h" +#include "gdbthread.h" #include "gdbcmd.h" #include diff --git a/gdb/procfs.c b/gdb/procfs.c index 020f6b7926..7d049ff7f8 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -51,7 +51,7 @@ regardless of whether or not the actual target has floating point hardware. #include "target.h" #include "command.h" #include "gdbcore.h" -#include "thread.h" +#include "gdbthread.h" #define MAX_SYSCALLS 256 /* Maximum number of syscalls for table */ diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index 3f234fd379..074754668c 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "/usr/include/thread.h" #include #include -#include "thread.h" +#include "gdbthread.h" #include "target.h" #include "inferior.h" #include diff --git a/gdb/thread.c b/gdb/thread.c index d3ed393b2c..88da48081b 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "environ.h" #include "value.h" #include "target.h" -#include "thread.h" +#include "gdbthread.h" #include "command.h" #include "gdbcmd.h" diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 2b50f6d661..82b5e0ba93 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -36,7 +36,7 @@ #include "symfile.h" #include "objfiles.h" #include "gdb_string.h" -#include "thread.h" +#include "gdbthread.h" #include "gdbcmd.h" #include