* 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.

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 62f74313902e10e66541e8a69f7bca483edd95de..b446ac3a356aab258ade35165d173423f197b4bd 100644 (file)
--- 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 23de2ea2003788c410bfdabc968f05c8e5a88820..64bb858e2491e9774fc99088484362097e5da0f0 100644 (file)
--- 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  <rob@chinadoll.cygnus.com>
 
        * abug-rom.c: Config file for the older style ABug monitor that

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index cd6cf67bff43ba6dcbc8a3aadd51ebe2c3539af2..be49ae5411f3b67de3c8d0137219393969a4d6a7 100644 (file)
--- 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 d9960ed1861c5f0d07f79be51d9953b898d6f452..54c01b6b463e78bebaa220c9ab99be9e6fc374d0 100644 (file)
--- 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 f182e9c5f77d640046c4019456243b269a766b41..0d01bf03b71a51ae80e79df5733efc116bae2345 100644 (file)
--- 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 1b00c9320e6f0be1d467b753f00937dc519840c3..243bed4afe686fdd5a0ea49aafb936d6d4103f8a 100644 (file)
--- 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 <signal.h>
 #ifdef HAVE_UNISTD_H

diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
new file mode 100644 (file)
index 0000000..33c2b11
--- /dev/null
+++ b/gdb/gdbthread.h
@@ -0,0 +1,46 @@
+/* Multi-process/thread control defs for GDB, the GNU debugger.
+   Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993
+
+   Contributed by Lynx Real-Time Systems, Inc.  Los Gatos, CA.
+   Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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 GDBTHREAD_H
+#define GDBTHREAD_H
+
+extern void init_thread_list PARAMS ((void));
+
+extern void add_thread PARAMS ((int pid));
+
+extern int in_thread_list PARAMS ((int pid));
+
+extern int pid_to_thread_id PARAMS ((int pid));
+
+extern int valid_thread_id PARAMS ((int thread));
+
+extern void load_infrun_state PARAMS ((int, CORE_ADDR *, CORE_ADDR *, char **,
+                                      int *, struct breakpoint **,
+                                      struct breakpoint **, CORE_ADDR *,
+                                      CORE_ADDR *, CORE_ADDR *, int *, int *));
+
+extern void save_infrun_state PARAMS ((int, CORE_ADDR, CORE_ADDR, char *,
+                                      int, struct breakpoint *,
+                                      struct breakpoint *, CORE_ADDR,
+                                      CORE_ADDR, CORE_ADDR, int, int));
+
+#endif /* GDBTHREAD_H */

diff --git a/gdb/infrun.c b/gdb/infrun.c
index ee41c09481b9df41bbadbbda61752cc173e8fbfd..0089b7ef7859c669c3f7d99d265703179f572e10 100644 (file)
--- 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 <signal.h>

diff --git a/gdb/mac-nat.c b/gdb/mac-nat.c
index bdf6c6df2c40cee00fc72842541856fd260ec961..f827fca66f53e1913bef8e7ee12140286263ccdb 100644 (file)
--- 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 <fcntl.h>
 #include "buildsym.h"
 #include "gdb_string.h"
-#include "thread.h"
+#include "gdbthread.h"
 #include "gdbcmd.h"
 
 #include <Processes.h>

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 020f6b7926c08446fa1ed85768bda7ad4ea67619..7d049ff7f81b9309e8429433e94672f56413f4a1 100644 (file)
--- 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 3f234fd3793c3b2ac3abab07eea6cd35ca64bb20..074754668c88421dd3e8f467614d0c377f5f1156 100644 (file)
--- 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 <proc_service.h>
 #include <thread_db.h>
-#include "thread.h"
+#include "gdbthread.h"
 #include "target.h"
 #include "inferior.h"
 #include <fcntl.h>

diff --git a/gdb/thread.c b/gdb/thread.c
index d3ed393b2cec9e15dc99667bb1089290e00f465f..88da48081be1eb61e574934c5ce83f3d8e120d75 100644 (file)
--- 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/thread.h b/gdb/thread.h
deleted file mode 100644 (file)
index 6777887..0000000
--- a/gdb/thread.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Multi-process/thread control defs for GDB, the GNU debugger.
-   Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993
-
-   Contributed by Lynx Real-Time Systems, Inc.  Los Gatos, CA.
-   Free Software Foundation, Inc.
-
-This file is part of GDB.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-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
-
-extern void init_thread_list PARAMS ((void));
-
-extern void add_thread PARAMS ((int pid));
-
-extern int in_thread_list PARAMS ((int pid));
-
-extern int pid_to_thread_id PARAMS ((int pid));
-
-extern int valid_thread_id PARAMS ((int thread));
-
-extern void load_infrun_state PARAMS ((int, CORE_ADDR *, CORE_ADDR *, char **,
-                                      int *, struct breakpoint **,
-                                      struct breakpoint **, CORE_ADDR *,
-                                      CORE_ADDR *, CORE_ADDR *, int *, int *));
-
-extern void save_infrun_state PARAMS ((int, CORE_ADDR, CORE_ADDR, char *,
-                                      int, struct breakpoint *,
-                                      struct breakpoint *, CORE_ADDR,
-                                      CORE_ADDR, CORE_ADDR, int, int));
-
-#endif /* THREAD_H */

diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 2b50f6d661f374ab1a29ba6e9fef636d52b6728c..82b5e0ba9362df2b3e1f654ec90c5dc1b37eea1b 100644 (file)
--- 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 <sys/param.h>