This is the mail archive of the gdb-patches@sourceware.cygnus.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] Replace ../include/wait.h with gdb_wait.h.


FYI,

I've just checked in the attatched patch.  It replaces the sometimes
convoluted sequence:

	#ifdef HAVE_WAIT_H
	#include <wait.h>
	#else
	#ifdef HAVE_SYS_WAIT_H
	#include <sys/wait.h>
	#endif
	#endif
	#include "wait.h"

with:

	#include "gdb_wait.h"

Files that only need to compile on a POSIX platform (the *-nat.c files)
can get away with #include <sys/wait.h> and I've not changed them.

This will be followed by a second patch that deletes ../include/wait.h.

So far this has only been verified on for the d10v-elf target.  Please
report / submit patches for other targets.

	Andrew
Wed Feb  9 18:59:16 2000  Andrew Cagney  <cagney@b1.cygnus.com>

	* Makefile.in (wait_h): Delete macro.  Update all dependencies
 	specifying gdb_wait.h instead.

	* ser-unix.c, ser-pipe.c, remote.c, remote-udi.c, remote-sds.c,
 	remote-os9k.c, remote-es.c, remote-rdp.c, remote-vx960.c,
 	remote-vx.c, remote-st.c, remote-nindy.c, remote-mm.c,
 	convex-xdep.c, convex-tdep.c, target.c, win32-nat.c, standalone.c,
 	remote-vxmips.c, remote-vxsparc.c, remote-vx68.c, remote-vx29k.c,
 	remote-sim.c, remote-rdi.c, remote-mips.c, remote-eb.c,
 	remote-e7000.c, remote-bug.c, remote-array.c, remote-adapt.c,
 	ppc-bdm.c, ocd.c, monitor.c, m3-nat.c, linux-thread.c,
 	infttrace.c, lin-thread.c, infptrace.c, gnu-nat.c, gdbarch.c,
 	fork-child.c, command.c: Include "gdb_wait.h" instead of <wait.h>
 	or <sys/wait.h>.

	* gdb_wait.h: New file.  Based on ../include/wait.h. Include
 	<sys/wait.h> or <wait.h> and then define any missing WIF macros.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.2
diff -p -r1.2 Makefile.in
*** Makefile.in	2000/02/08 16:25:07	1.2
--- Makefile.in	2000/02/09 08:32:39
*************** getopt_h =	$(INCLUDE_DIR)/getopt.h
*** 461,467 ****
  floatformat_h =	$(INCLUDE_DIR)/floatformat.h
  bfd_h =		$(BFD_DIR)/bfd.h
  elf_bfd_h =     $(BFD_SRC)/elf-bfd.h
- wait_h =	$(INCLUDE_DIR)/wait.h
  dis-asm_h =	$(INCLUDE_DIR)/dis-asm.h 
  remote-sim_h =	$(INCLUDE_DIR)/remote-sim.h
  
--- 461,466 ----
*************** coffread.o: coffread.c $(bfd_h) $(breakp
*** 1146,1156 ****
  	gdb_string.h
  
  command.o: command.c $(defs_h) $(expression_h) $(gdbcmd_h) \
! 	$(gdbtypes_h) $(symtab_h) $(value_h) gdb_string.h $(wait_h)
  
  complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
  
! # OBSOLETE convex-tdep.o: convex-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) \
  # OBSOLETE	$(gdbcore_h) $(inferior_h)
  
  # OBSOLETE convex-xdep.o: convex-xdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
--- 1145,1155 ----
  	gdb_string.h
  
  command.o: command.c $(defs_h) $(expression_h) $(gdbcmd_h) \
! 	$(gdbtypes_h) $(symtab_h) $(value_h) gdb_string.h gdb_wait.h
  
  complaints.o: complaints.c complaints.h $(defs_h) $(gdbcmd_h)
  
! # OBSOLETE convex-tdep.o: convex-tdep.c gdb_wait.h $(defs_h) $(gdbcmd_h) \
  # OBSOLETE	$(gdbcore_h) $(inferior_h)
  
  # OBSOLETE convex-xdep.o: convex-xdep.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
*************** delta68-nat.o: delta68-nat.c $(defs_h)
*** 1186,1192 ****
  
  demangle.o: demangle.c $(defs_h) $(gdbcmd_h) gdb_string.h
  
! dink32-rom.o: dink32-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h symfile.h
  
  dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) gdb_string.h
--- 1185,1191 ----
  
  demangle.o: demangle.c $(defs_h) $(gdbcmd_h) gdb_string.h
  
! dink32-rom.o: dink32-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h symfile.h
  
  dpx2-nat.o: dpx2-nat.c $(defs_h) $(gdbcore_h) gdb_string.h
*************** expprint.o: expprint.c $(defs_h) $(expre
*** 1229,1235 ****
  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 gdbthread.h gdb_string.h
  
  gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
--- 1228,1234 ----
  findvar.o: findvar.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \
  	gdb_string.h
  
! fork-child.o: fork-child.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h gdbthread.h gdb_string.h
  
  gdbres.o: $(srcdir)/gdbtk/gdb.rc $(srcdir)/gdbtk/gdbtool.ico
*************** h8500-tdep.o: h8500-tdep.c $(bfd_h) $(di
*** 1314,1320 ****
  
  hp300ux-nat.o: hp300ux-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
  
! hppa-tdep.o: hppa-tdep.c $(wait_h) $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
  	$(inferior_h) objfiles.h symfile.h target.h
  
  hppab-nat.o: hppab-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
--- 1313,1319 ----
  
  hp300ux-nat.o: hp300ux-nat.c $(defs_h) $(gdbcore_h) $(inferior_h)
  
! hppa-tdep.o: hppa-tdep.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
  	$(inferior_h) objfiles.h symfile.h target.h
  
  hppab-nat.o: hppab-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
*************** inflow.o: inflow.c $(bfd_h) $(command_h)
*** 1361,1373 ****
  	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 gdbthread.h gdb_string.h $(event_loop_h) \
  	$(event_top_h) target.h
  
! inftarg.o: inftarg.c $(wait_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
  	target.h terminal.h $(command_h)
  
  irix4-nat.o: irix4-nat.c $(defs_h) $(inferior_h) $(gdbcore_h)
--- 1360,1372 ----
  	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 gdb_wait.h $(command_h)
  
! infrun.o: infrun.c gdb_wait.h $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
  	$(inferior_h) target.h gdbthread.h gdb_string.h $(event_loop_h) \
  	$(event_top_h) target.h
  
! inftarg.o: inftarg.c gdb_wait.h $(defs_h) $(gdbcore_h) $(inferior_h) \
  	target.h terminal.h $(command_h)
  
  irix4-nat.o: irix4-nat.c $(defs_h) $(inferior_h) $(gdbcore_h)
*************** m2-valprint.o: m2-valprint.c $(defs_h) $
*** 1411,1417 ****
  	valprint.h m2-lang.h
  
  m3-nat.o: m3-nat.c $(defs_h) $(inferior_h) $(value_h) language.h target.h \
! 	$(wait_h) $(gdbcmd_h) $(gdbcore_h)
  
  m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
  	$(gdbcore_h) gdb_string.h
--- 1410,1416 ----
  	valprint.h m2-lang.h
  
  m3-nat.o: m3-nat.c $(defs_h) $(inferior_h) $(value_h) language.h target.h \
! 	gdb_wait.h $(gdbcmd_h) $(gdbcore_h)
  
  m68k-tdep.o: m68k-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(value_h) \
  	$(gdbcore_h) gdb_string.h
*************** mipsread.o: mipsread.c buildsym.h compla
*** 1466,1481 ****
  
  mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
  
! monitor.o: monitor.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h gdb_string.h
  
  news-xdep.o: news-xdep.c
  
! Onindy.o: nindy-share/Onindy.c $(wait_h) nindy-share/block_io.h \
  	nindy-share/env.h
  	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/Onindy.c
  
! nindy.o: nindy-share/nindy.c $(wait_h) nindy-share/block_io.h \
  	nindy-share/env.h
  	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/nindy.c
  
--- 1465,1480 ----
  
  mipsv4-nat.o: mipsv4-nat.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h
  
! monitor.o: monitor.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h gdb_string.h
  
  news-xdep.o: news-xdep.c
  
! Onindy.o: nindy-share/Onindy.c gdb_wait.h nindy-share/block_io.h \
  	nindy-share/env.h
  	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/Onindy.c
  
! nindy.o: nindy-share/nindy.c gdb_wait.h nindy-share/block_io.h \
  	nindy-share/env.h
  	$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/nindy-share/nindy.c
  
*************** parse.o: parse.c $(command_h) $(defs_h) 
*** 1526,1535 ****
  	gdb_string.h
  
  ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) gdb_string.h $(frame_h) \
! 	$(inferior_h) $(bfd_h) symfile.h target.h $(wait_h) $(gdbcmd_h) \
  	objfiles.h gdb-stabs.h serial.h ocd.h
  
! ppcbug-rom.o: ppcbug-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
  printcmd.o: printcmd.c $(breakpoint_h) $(defs_h) $(expression_h) \
--- 1525,1534 ----
  	gdb_string.h
  
  ppc-bdm.o: ppc-bdm.c $(defs_h) $(gdbcore_h) gdb_string.h $(frame_h) \
! 	$(inferior_h) $(bfd_h) symfile.h target.h gdb_wait.h $(gdbcmd_h) \
  	objfiles.h gdb-stabs.h serial.h ocd.h
  
! ppcbug-rom.o: ppcbug-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
  printcmd.o: printcmd.c $(breakpoint_h) $(defs_h) $(expression_h) \
*************** proc-why.o: proc-why.c $(defs_h) proc-ut
*** 1553,1559 ****
  sol-thread.o: sol-thread.c $(defs_h) gdbthread.h target.h $(inferior_h) \
  	$(gdbcmd_h)
  
! linux-thread.o: linux-thread.c $(breakpoint_h) $(gdbcmd_h) $(wait_h) \
  	gdbthread.h $(gdbcore_h) $(inferior_h) target.h $(defs_h)
  
  # OBSOLETE pyr-tdep.o: pyr-tdep.c $(defs_h) 
--- 1552,1558 ----
  sol-thread.o: sol-thread.c $(defs_h) gdbthread.h target.h $(inferior_h) \
  	$(gdbcmd_h)
  
! linux-thread.o: linux-thread.c $(breakpoint_h) $(gdbcmd_h) gdb_wait.h \
  	gdbthread.h $(gdbcore_h) $(inferior_h) target.h $(defs_h)
  
  # OBSOLETE pyr-tdep.o: pyr-tdep.c $(defs_h) 
*************** linux-thread.o: linux-thread.c $(breakpo
*** 1562,1575 ****
  
  gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h) gdb_string.h
  
! remote-adapt.o: remote-adapt.c $(wait_h) $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h gdb_string.h
  
! remote-array.o: remote-array.c $(wait_h) $(defs_h) $(gdbcore_h) target.h \
        gdb_string.h $(command_h) serial.h monitor.h $(remote_utils_h) \
  	$(version_h)
  
! remote-rdi.o: remote-rdi.c $(wait_h) $(defs_h) $(gdbcore_h) \
  	$(inferior_h) gdb_string.h
  
  rdi-share/libangsd.a:	force
--- 1561,1574 ----
  
  gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h) gdb_string.h
  
! remote-adapt.o: remote-adapt.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h gdb_string.h
  
! remote-array.o: remote-array.c gdb_wait.h $(defs_h) $(gdbcore_h) target.h \
        gdb_string.h $(command_h) serial.h monitor.h $(remote_utils_h) \
  	$(version_h)
  
! remote-rdi.o: remote-rdi.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) gdb_string.h
  
  rdi-share/libangsd.a:	force
*************** rdi-share/libangsd.a:	force
*** 1582,1594 ****
  	  true; \
  	fi
  
! remote-d10v.o: remote-d10v.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h
  
! remote-rdp.o: remote-rdp.c $(wait_h) $(defs_h) $(gdbcore_h) \
  	$(inferior_h) gdb_string.h
  
! remote-bug.o: remote-bug.c $(wait_h) $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h $(remote_utils_h) gdb_string.h
  
  # FIXME: For the SH target, remote-e7000 contains numerous -Wformat
--- 1581,1593 ----
  	  true; \
  	fi
  
! remote-d10v.o: remote-d10v.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h
  
! remote-rdp.o: remote-rdp.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) gdb_string.h
  
! remote-bug.o: remote-bug.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h $(remote_utils_h) gdb_string.h
  
  # FIXME: For the SH target, remote-e7000 contains numerous -Wformat
*************** remote-bug.o: remote-bug.c $(wait_h) $(d
*** 1596,1668 ****
  # handles the SH remote protocol the changes need to be tested against
  # an SH board before they can be committed. cagney 1999-09-01.
  remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) target.h \
! 	$(wait_h) serial.h gdb_string.h
  	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
  
! remote-eb.o: remote-eb.c $(wait_h) $(srcdir)/config/a29k/tm-a29k.h \
  	$(defs_h) $(gdbcore_h) $(inferior_h) symfile.h target.h terminal.h \
  	gdb_string.h
  
! remote-es.o: remote-es.c $(bfd_h) $(wait_h) $(command_h) $(defs_h) \
  	$(inferior_h) $(remote_utils_h) terminal.h gdb_string.h
  
! remote-hms.o: remote-hms.c $(wait_h) $(defs_h) $(gdbcore_h) \
  	$(inferior_h) serial.h target.h terminal.h gdb_string.h
  
! remote-mips.o: remote-mips.c $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(gdbcore_h) $(inferior_h) serial.h symfile.h target.h
  
! remote-mm.o: remote-mm.c $(bfd_h) $(wait_h) $(defs_h) $(inferior_h) \
  	minimon.h target.h terminal.h gdb_string.h
  
! remote-nindy.o: remote-nindy.c $(floatformat_h) $(wait_h) $(command_h) \
  	$(defs_h) $(gdbcore_h) $(inferior_h) \
  	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
  	symfile.h
  
! remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) $(wait_h) \
  	$(command_h) monitor.h $(remote_utils_h) $(symtab_h) symfile.h \
  	objfiles.h gdb-stabs.h gdb_string.h
  
! remote-sds.o: remote-sds.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h
  
! remote-sim.o: remote-sim.c $(wait_h) $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h gdb_string.h \
  	$(INCLUDE_DIR)/callback.h
  
! remote-st.o: remote-st.c $(wait_h) $(defs_h) $(gdbcore_h) serial.h \
  	target.h gdb_string.h
  
! remote-udi.o: remote-udi.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h terminal.h $(udiheaders) gdb_string.h
  
! remote-vx.o: remote-vx.c $(wait_h) complaints.h $(defs_h) $(gdbcmd_h) \
  	$(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
  	vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
  	vx-share/xdr_rdb.h gdb-stabs.h objfiles.h symfile.h $(bfd_h) \
  	gdb_string.h
  
! remote-vx29k.o: remote-vx29k.c $(wait_h) complaints.h $(defs_h) $(gdbcmd_h) \
          $(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
          vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
          vx-share/xdr_rdb.h gdb_string.h
  
  ocd.o: ocd.c ocd.h $(gdbcore_h) gdb_string.h $(frame_h) $(inferior_h) \
! 	$(bfd_h) symfile.h target.h $(wait_h) $(gdbcmd_h) objfiles.h \
  	gdb-stabs.h $(dcache_h) serial.h
  
  remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
  	$(inferior_h) $(remote_utils_h) gdb_string.h
  
! remote.o: remote.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h \
  	$(event_loop_h) $(event_top_h) $(remote_h) $(inf_loop_h)
  
! remote-nrom.o: remote-nrom.c $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
  
! rom68k-rom.o: rom68k-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
  rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h \
--- 1595,1667 ----
  # handles the SH remote protocol the changes need to be tested against
  # an SH board before they can be committed. cagney 1999-09-01.
  remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) target.h \
! 	gdb_wait.h serial.h gdb_string.h
  	$(CC) -c $(INTERNAL_WARN_CFLAGS) $(NO_WERROR_CFLAGS) $<
  
! remote-eb.o: remote-eb.c gdb_wait.h $(srcdir)/config/a29k/tm-a29k.h \
  	$(defs_h) $(gdbcore_h) $(inferior_h) symfile.h target.h terminal.h \
  	gdb_string.h
  
! remote-es.o: remote-es.c $(bfd_h) gdb_wait.h $(command_h) $(defs_h) \
  	$(inferior_h) $(remote_utils_h) terminal.h gdb_string.h
  
! remote-hms.o: remote-hms.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) serial.h target.h terminal.h gdb_string.h
  
! remote-mips.o: remote-mips.c gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(gdbcore_h) $(inferior_h) serial.h symfile.h target.h
  
! remote-mm.o: remote-mm.c $(bfd_h) gdb_wait.h $(defs_h) $(inferior_h) \
  	minimon.h target.h terminal.h gdb_string.h
  
! remote-nindy.o: remote-nindy.c $(floatformat_h) gdb_wait.h $(command_h) \
  	$(defs_h) $(gdbcore_h) $(inferior_h) \
  	nindy-share/env.h nindy-share/stop.h $(remote_utils_h) \
  	symfile.h
  
! remote-os9k.o: remote-os9k.c $(defs_h) $(gdbcore_h) gdb_wait.h \
  	$(command_h) monitor.h $(remote_utils_h) $(symtab_h) symfile.h \
  	objfiles.h gdb-stabs.h gdb_string.h
  
! remote-sds.o: remote-sds.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h
  
! remote-sim.o: remote-sim.c gdb_wait.h $(defs_h) $(gdbcore_h) \
  	$(inferior_h) target.h terminal.h gdb_string.h \
  	$(INCLUDE_DIR)/callback.h
  
! remote-st.o: remote-st.c gdb_wait.h $(defs_h) $(gdbcore_h) serial.h \
  	target.h gdb_string.h
  
! remote-udi.o: remote-udi.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h terminal.h $(udiheaders) gdb_string.h
  
! remote-vx.o: remote-vx.c gdb_wait.h complaints.h $(defs_h) $(gdbcmd_h) \
  	$(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
  	vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
  	vx-share/xdr_rdb.h gdb-stabs.h objfiles.h symfile.h $(bfd_h) \
  	gdb_string.h
  
! remote-vx29k.o: remote-vx29k.c gdb_wait.h complaints.h $(defs_h) $(gdbcmd_h) \
          $(gdbcore_h) $(inferior_h) target.h vx-share/dbgRpcLib.h \
          vx-share/ptrace.h vx-share/xdr_ld.h vx-share/xdr_ptrace.h \
          vx-share/xdr_rdb.h gdb_string.h
  
  ocd.o: ocd.c ocd.h $(gdbcore_h) gdb_string.h $(frame_h) $(inferior_h) \
! 	$(bfd_h) symfile.h target.h gdb_wait.h $(gdbcmd_h) objfiles.h \
  	gdb-stabs.h $(dcache_h) serial.h
  
  remote-utils.o: remote-utils.c $(defs_h) $(gdbcmd_h) $(gdbcore_h) \
  	$(inferior_h) $(remote_utils_h) gdb_string.h
  
! remote.o: remote.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h gdb_string.h \
  	$(event_loop_h) $(event_top_h) $(remote_h) $(inf_loop_h)
  
! remote-nrom.o: remote-nrom.c $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) $(remote_utils_h) symfile.h terminal.h
  
! rom68k-rom.o: rom68k-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
  rs6000-nat.o: rs6000-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h \
*************** sh-tdep.o: sh-tdep.c $(bfd_h) $(dis-asm_
*** 1698,1707 ****
  	$(srcdir)/../opcodes/sh-opc.h $(defs_h) $(expression_h) $(frame_h) \
  	$(gdbcmd_h) $(gdbtypes_h) $(symtab_h) $(value_h)
  
! sh3-rom.o: sh3-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
! mon960-rom.o: mon960-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
  solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
--- 1697,1706 ----
  	$(srcdir)/../opcodes/sh-opc.h $(defs_h) $(expression_h) $(frame_h) \
  	$(gdbcmd_h) $(gdbtypes_h) $(symtab_h) $(value_h)
  
! sh3-rom.o: sh3-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
! mon960-rom.o: mon960-rom.c monitor.h $(bfd_h) gdb_wait.h $(defs_h) $(gdbcmd_h) \
  	$(inferior_h) target.h serial.h terminal.h
  
  solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
Index: command.c
===================================================================
RCS file: /cvs/src/src/gdb/command.c,v
retrieving revision 1.1.1.12
diff -p -r1.1.1.12 command.c
*** command.c	2000/02/03 04:14:27	1.1.1.12
--- command.c	2000/02/09 08:32:41
***************
*** 26,38 ****
  #include "ui-out.h"
  #endif
  
! #if HAVE_SYS_WAIT_H
! #include <sys/wait.h>
! #elif HAVE_WAIT_H
! #include <wait.h>
! #endif
! 
! #include "wait.h"
  
  /* FIXME: this should be auto-configured!  */
  #ifdef __MSDOS__
--- 26,32 ----
  #include "ui-out.h"
  #endif
  
! #include "gdb_wait.h"
  
  /* FIXME: this should be auto-configured!  */
  #ifdef __MSDOS__
Index: convex-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/convex-tdep.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 convex-tdep.c
*** convex-tdep.c	2000/02/02 00:21:05	1.1.1.6
--- convex-tdep.c	2000/02/09 08:32:44
***************
*** 23,29 ****
  /* OBSOLETE #include "value.h" */
  /* OBSOLETE #include "frame.h" */
  /* OBSOLETE #include "inferior.h" */
! /* OBSOLETE #include "wait.h" */
  /* OBSOLETE  */
  /* OBSOLETE #include <signal.h> */
  /* OBSOLETE #include <fcntl.h> */
--- 23,29 ----
  /* OBSOLETE #include "value.h" */
  /* OBSOLETE #include "frame.h" */
  /* OBSOLETE #include "inferior.h" */
! /* OBSOLETE #include "gdb_wait.h" */
  /* OBSOLETE  */
  /* OBSOLETE #include <signal.h> */
  /* OBSOLETE #include <fcntl.h> */
Index: convex-xdep.c
===================================================================
RCS file: /cvs/src/src/gdb/convex-xdep.c,v
retrieving revision 1.1.1.4
diff -p -r1.1.1.4 convex-xdep.c
*** convex-xdep.c	1999/07/07 20:05:11	1.1.1.4
--- convex-xdep.c	2000/02/09 08:32:46
***************
*** 23,29 ****
  /* OBSOLETE #include "value.h" */
  /* OBSOLETE #include "frame.h" */
  /* OBSOLETE #include "inferior.h" */
! /* OBSOLETE #include "wait.h" */
  /* OBSOLETE  */
  /* OBSOLETE #include <signal.h> */
  /* OBSOLETE #include <fcntl.h> */
--- 23,29 ----
  /* OBSOLETE #include "value.h" */
  /* OBSOLETE #include "frame.h" */
  /* OBSOLETE #include "inferior.h" */
! /* OBSOLETE #include "gdb_wait.h" */
  /* OBSOLETE  */
  /* OBSOLETE #include <signal.h> */
  /* OBSOLETE #include <fcntl.h> */
Index: fork-child.c
===================================================================
RCS file: /cvs/src/src/gdb/fork-child.c,v
retrieving revision 1.1.1.5
diff -p -r1.1.1.5 fork-child.c
*** fork-child.c	1999/12/07 03:56:00	1.1.1.5
--- fork-child.c	2000/02/09 08:32:48
***************
*** 24,30 ****
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcore.h"
  #include "terminal.h"
  #include "gdbthread.h"
--- 24,30 ----
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcore.h"
  #include "terminal.h"
  #include "gdbthread.h"
Index: gdbarch.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbarch.c,v
retrieving revision 1.1.1.14
diff -p -r1.1.1.14 gdbarch.c
*** gdbarch.c	1999/12/14 01:05:30	1.1.1.14
--- gdbarch.c	2000/02/09 08:32:53
***************
*** 47,53 ****
  #include "frame.h"
  #include "inferior.h"
  #include "breakpoint.h"
! #include "wait.h"
  #include "gdbcore.h"
  #include "gdbcmd.h"
  #include "target.h"
--- 47,53 ----
  #include "frame.h"
  #include "inferior.h"
  #include "breakpoint.h"
! #include "gdb_wait.h"
  #include "gdbcore.h"
  #include "gdbcmd.h"
  #include "target.h"
Index: gnu-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/gnu-nat.c,v
retrieving revision 1.1.1.9
diff -p -r1.1.1.9 gnu-nat.c
*** gnu-nat.c	2000/02/01 03:19:07	1.1.1.9
--- gnu-nat.c	2000/02/09 08:33:00
***************
*** 60,66 ****
  #include "value.h"
  #include "language.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "gdbcore.h"
  
--- 60,66 ----
  #include "value.h"
  #include "language.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "gdbcore.h"
  
Index: go32-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/go32-nat.c,v
retrieving revision 1.1.1.10
diff -p -r1.1.1.10 go32-nat.c
*** go32-nat.c	1999/12/07 03:56:01	1.1.1.10
--- go32-nat.c	2000/02/09 08:33:02
***************
*** 25,31 ****
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcore.h"
  #include "command.h"
  #include "floatformat.h"
--- 25,31 ----
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcore.h"
  #include "command.h"
  #include "floatformat.h"
Index: hppa-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-tdep.c,v
retrieving revision 1.1.1.16
diff -p -r1.1.1.16 hppa-tdep.c
*** hppa-tdep.c	2000/02/02 00:21:08	1.1.1.16
--- hppa-tdep.c	2000/02/09 08:33:13
***************
*** 49,55 ****
  /*#include <sys/user.h>         After a.out.h  */
  #include <sys/file.h>
  #include "gdb_stat.h"
! #include "wait.h"
  
  #include "gdbcore.h"
  #include "gdbcmd.h"
--- 49,55 ----
  /*#include <sys/user.h>         After a.out.h  */
  #include <sys/file.h>
  #include "gdb_stat.h"
! #include "gdb_wait.h"
  
  #include "gdbcore.h"
  #include "gdbcmd.h"
Index: infptrace.c
===================================================================
RCS file: /cvs/src/src/gdb/infptrace.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 infptrace.c
*** infptrace.c	1999/12/22 21:45:07	1.1.1.6
--- infptrace.c	2000/02/09 08:33:16
***************
*** 25,40 ****
  #include "target.h"
  #include "gdb_string.h"
  
! #ifdef HAVE_WAIT_H
! #include <wait.h>
! #else
! #ifdef HAVE_SYS_WAIT_H
! #include <sys/wait.h>
! #endif
! #endif
! 
! /* "wait.h" fills in the gaps left by <wait.h> */
! #include "wait.h"	/* NOTE: This is ../include/wait.h */
  
  #include "command.h"
  
--- 25,31 ----
  #include "target.h"
  #include "gdb_string.h"
  
! #include "gdb_wait.h"
  
  #include "command.h"
  
Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.1.1.27
diff -p -r1.1.1.27 infrun.c
*** infrun.c	2000/02/05 07:29:43	1.1.1.27
--- infrun.c	2000/02/09 08:33:25
***************
*** 25,31 ****
  #include "frame.h"
  #include "inferior.h"
  #include "breakpoint.h"
! #include "wait.h"
  #include "gdbcore.h"
  #include "gdbcmd.h"
  #include "target.h"
--- 25,31 ----
  #include "frame.h"
  #include "inferior.h"
  #include "breakpoint.h"
! #include "gdb_wait.h"
  #include "gdbcore.h"
  #include "gdbcmd.h"
  #include "target.h"
Index: inftarg.c
===================================================================
RCS file: /cvs/src/src/gdb/inftarg.c,v
retrieving revision 1.1.1.8
diff -p -r1.1.1.8 inftarg.c
*** inftarg.c	1999/12/22 21:45:07	1.1.1.8
--- inftarg.c	2000/02/09 08:33:27
***************
*** 32,47 ****
  #include <sys/types.h>
  #include <fcntl.h>
  
! #ifdef HAVE_WAIT_H
! #include <wait.h>
! #else
! #ifdef HAVE_SYS_WAIT_H
! #include <sys/wait.h>
! #endif
! #endif
! 
! /* "wait.h" fills in the gaps left by <wait.h> */
! #include "wait.h"
  
  extern struct symtab_and_line *
    child_enable_exception_callback PARAMS ((enum exception_event_kind, int));
--- 32,38 ----
  #include <sys/types.h>
  #include <fcntl.h>
  
! #include "gdb_wait.h"
  
  extern struct symtab_and_line *
    child_enable_exception_callback PARAMS ((enum exception_event_kind, int));
Index: infttrace.c
===================================================================
RCS file: /cvs/src/src/gdb/infttrace.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 infttrace.c
*** infttrace.c	1999/12/22 21:45:07	1.1.1.6
--- infttrace.c	2000/02/09 08:33:39
***************
*** 24,30 ****
  #include "inferior.h"
  #include "target.h"
  #include "gdb_string.h"
! #include "wait.h"
  #include "command.h"
  
  /* Some hackery to work around a use of the #define name NO_FLAGS
--- 24,30 ----
  #include "inferior.h"
  #include "target.h"
  #include "gdb_string.h"
! #include "gdb_wait.h"
  #include "command.h"
  
  /* Some hackery to work around a use of the #define name NO_FLAGS
Index: lin-thread.c
===================================================================
RCS file: /cvs/src/src/gdb/lin-thread.c,v
retrieving revision 1.1.1.1
diff -p -r1.1.1.1 lin-thread.c
*** lin-thread.c	1999/12/22 21:45:07	1.1.1.1
--- lin-thread.c	2000/02/09 08:33:44
***************
*** 102,117 ****
  #include "inferior.h"
  #include "gdbcmd.h"
  
! #ifdef HAVE_WAIT_H
! #include <wait.h>
! #else
! #ifdef HAVE_SYS_WAIT_H
! #include <sys/wait.h>
! #endif
! #endif
! 
! /* "wait.h" fills in the gaps left by <wait.h> */
! #include "wait.h"
  
  #include <time.h>
  
--- 102,108 ----
  #include "inferior.h"
  #include "gdbcmd.h"
  
! #include "gdb_wait.h"
  
  #include <time.h>
  
Index: linux-thread.c
===================================================================
RCS file: /cvs/src/src/gdb/linux-thread.c,v
retrieving revision 1.1.1.5
diff -p -r1.1.1.5 linux-thread.c
*** linux-thread.c	2000/01/25 02:39:44	1.1.1.5
--- linux-thread.c	2000/02/09 08:33:46
*************** Foundation, Inc., 59 Temple Place - Suit
*** 49,55 ****
  
  #include <sys/types.h> /* for pid_t */
  #include <sys/ptrace.h> /* for PT_* flags */
! #include <sys/wait.h> /* for WUNTRACED and __WCLONE flags */
  #include <signal.h> /* for struct sigaction and NSIG */
  #include <sys/utsname.h>
  
--- 49,55 ----
  
  #include <sys/types.h> /* for pid_t */
  #include <sys/ptrace.h> /* for PT_* flags */
! #include "gdb_wait.h" /* for WUNTRACED and __WCLONE flags */
  #include <signal.h> /* for struct sigaction and NSIG */
  #include <sys/utsname.h>
  
*************** Foundation, Inc., 59 Temple Place - Suit
*** 58,64 ****
  #include "inferior.h"
  #include "gdbcore.h"
  #include "gdbthread.h"
- #include "wait.h"
  #include "gdbcmd.h"
  #include "breakpoint.h"
  
--- 58,63 ----
Index: m3-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/m3-nat.c,v
retrieving revision 1.1.1.5
diff -p -r1.1.1.5 m3-nat.c
*** m3-nat.c	2000/02/02 00:21:08	1.1.1.5
--- m3-nat.c	2000/02/09 08:33:55
***************
*** 53,59 ****
  #include "value.h"
  #include "language.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "gdbcore.h"
  
--- 53,59 ----
  #include "value.h"
  #include "language.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "gdbcore.h"
  
Index: mac-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/mac-nat.c,v
retrieving revision 1.1.1.3
diff -p -r1.1.1.3 mac-nat.c
*** mac-nat.c	1999/10/05 23:08:29	1.1.1.3
--- mac-nat.c	2000/02/09 08:33:55
***************
*** 26,32 ****
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcore.h"
  #include "command.h"
  #include <signal.h>
--- 26,32 ----
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcore.h"
  #include "command.h"
  #include <signal.h>
Index: monitor.c
===================================================================
RCS file: /cvs/src/src/gdb/monitor.c,v
retrieving revision 1.1.1.10
diff -p -r1.1.1.10 monitor.c
*** monitor.c	2000/02/02 00:21:09	1.1.1.10
--- monitor.c	2000/02/09 08:34:00
***************
*** 40,46 ****
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "wait.h"
  #include <signal.h>
  #include <ctype.h>
  #include "gdb_string.h"
--- 40,46 ----
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include <signal.h>
  #include <ctype.h>
  #include "gdb_string.h"
Index: ocd.c
===================================================================
RCS file: /cvs/src/src/gdb/ocd.c,v
retrieving revision 1.1.1.3
diff -p -r1.1.1.3 ocd.c
*** ocd.c	1999/09/08 23:59:23	1.1.1.3
--- ocd.c	2000/02/09 08:34:02
***************
*** 27,33 ****
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
--- 27,33 ----
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
Index: ppc-bdm.c
===================================================================
RCS file: /cvs/src/src/gdb/ppc-bdm.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 ppc-bdm.c
*** ppc-bdm.c	1999/07/07 20:08:42	1.1.1.2
--- ppc-bdm.c	2000/02/09 08:34:04
***************
*** 28,34 ****
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
--- 28,34 ----
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
Index: remote-adapt.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-adapt.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-adapt.c
*** remote-adapt.c	1999/07/07 20:08:52	1.1.1.2
--- remote-adapt.c	2000/02/09 08:34:07
***************
*** 35,41 ****
  #include "defs.h"
  #include "gdb_string.h"
  #include "inferior.h"
! #include "wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
--- 35,41 ----
  #include "defs.h"
  #include "gdb_string.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
Index: remote-array.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-array.c,v
retrieving revision 1.1.1.4
diff -p -r1.1.1.4 remote-array.c
*** remote-array.c	1999/09/08 23:59:25	1.1.1.4
--- remote-array.c	2000/02/09 08:34:09
***************
*** 28,34 ****
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "wait.h"
  #include <ctype.h>
  #include <signal.h>
  #include <sys/types.h>
--- 28,34 ----
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include <ctype.h>
  #include <signal.h>
  #include <sys/types.h>
Index: remote-bug.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-bug.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-bug.c
*** remote-bug.c	1999/07/07 20:08:55	1.1.1.2
--- remote-bug.c	2000/02/09 08:34:11
***************
*** 23,29 ****
  
  #include "defs.h"
  #include "inferior.h"
! #include "wait.h"
  
  #include "gdb_string.h"
  #include <ctype.h>
--- 23,29 ----
  
  #include "defs.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  
  #include "gdb_string.h"
  #include <ctype.h>
Index: remote-e7000.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-e7000.c,v
retrieving revision 1.1.1.3
diff -p -r1.1.1.3 remote-e7000.c
*** remote-e7000.c	1999/07/07 20:08:58	1.1.1.3
--- remote-e7000.c	2000/02/09 08:34:16
***************
*** 37,43 ****
  #include "gdbarch.h"
  #include "inferior.h"
  #include "target.h"
! #include "wait.h"
  #include "value.h"
  #include "command.h"
  #include <signal.h>
--- 37,43 ----
  #include "gdbarch.h"
  #include "inferior.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include "command.h"
  #include <signal.h>
Index: remote-eb.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-eb.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-eb.c
*** remote-eb.c	1999/07/07 20:09:00	1.1.1.2
--- remote-eb.c	2000/02/09 08:34:18
***************
*** 32,38 ****
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
! #include "wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
--- 32,38 ----
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
Index: remote-es.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-es.c,v
retrieving revision 1.1.1.3
diff -p -r1.1.1.3 remote-es.c
*** remote-es.c	1999/09/22 03:24:54	1.1.1.3
--- remote-es.c	2000/02/09 08:34:20
***************
*** 104,110 ****
  #include "frame.h"
  #include "inferior.h"
  #include "target.h"
! #include "wait.h"
  #include "command.h"
  #include "remote-utils.h"
  #include "gdbcore.h"
--- 104,110 ----
  #include "frame.h"
  #include "inferior.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "command.h"
  #include "remote-utils.h"
  #include "gdbcore.h"
Index: remote-mips.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-mips.c,v
retrieving revision 1.1.1.7
diff -p -r1.1.1.7 remote-mips.c
*** remote-mips.c	2000/02/02 00:21:09	1.1.1.7
--- remote-mips.c	2000/02/09 08:34:29
***************
*** 24,30 ****
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "gdbcore.h"
  #include "serial.h"
--- 24,30 ----
  #include "inferior.h"
  #include "bfd.h"
  #include "symfile.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "gdbcore.h"
  #include "serial.h"
Index: remote-mm.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-mm.c,v
retrieving revision 1.1.1.3
diff -p -r1.1.1.3 remote-mm.c
*** remote-mm.c	1999/10/12 04:37:24	1.1.1.3
--- remote-mm.c	2000/02/09 08:34:34
***************
*** 32,38 ****
  
  #include "defs.h"
  #include "inferior.h"
! #include "wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
--- 32,38 ----
  
  #include "defs.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
Index: remote-nindy.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-nindy.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-nindy.c
*** remote-nindy.c	1999/07/07 20:09:09	1.1.1.2
--- remote-nindy.c	2000/02/09 08:34:34
***************
*** 109,115 ****
  #include "command.h"
  #include "floatformat.h"
  
! #include "wait.h"
  #include <sys/file.h>
  #include <ctype.h>
  #include "serial.h"
--- 109,115 ----
  #include "command.h"
  #include "floatformat.h"
  
! #include "gdb_wait.h"
  #include <sys/file.h>
  #include <ctype.h>
  #include "serial.h"
Index: remote-os9k.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-os9k.c,v
retrieving revision 1.1.1.7
diff -p -r1.1.1.7 remote-os9k.c
*** remote-os9k.c	1999/09/22 03:24:55	1.1.1.7
--- remote-os9k.c	2000/02/09 08:34:37
***************
*** 40,46 ****
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "wait.h"
  #include <signal.h>
  #include "gdb_string.h"
  #include <sys/types.h>
--- 40,46 ----
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include <signal.h>
  #include "gdb_string.h"
  #include <sys/types.h>
Index: remote-rdi.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-rdi.c,v
retrieving revision 1.1.1.10
diff -p -r1.1.1.10 remote-rdi.c
*** remote-rdi.c	2000/02/01 03:19:10	1.1.1.10
--- remote-rdi.c	2000/02/09 08:34:39
***************
*** 26,32 ****
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
--- 26,32 ----
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
Index: remote-rdp.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-rdp.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 remote-rdp.c
*** remote-rdp.c	1999/11/09 01:23:06	1.1.1.6
--- remote-rdp.c	2000/02/09 08:34:41
***************
*** 38,44 ****
  
  #include "defs.h"
  #include "inferior.h"
! #include "wait.h"
  #include "value.h"
  #include "callback.h"
  #include "command.h"
--- 38,44 ----
  
  #include "defs.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include "callback.h"
  #include "command.h"
Index: remote-sds.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-sds.c,v
retrieving revision 1.1.1.5
diff -p -r1.1.1.5 remote-sds.c
*** remote-sds.c	1999/09/08 23:59:27	1.1.1.5
--- remote-sds.c	2000/02/09 08:34:44
***************
*** 31,37 ****
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
--- 31,37 ----
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcmd.h"
  #include "objfiles.h"
  #include "gdb-stabs.h"
Index: remote-sim.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-sim.c,v
retrieving revision 1.1.1.10
diff -p -r1.1.1.10 remote-sim.c
*** remote-sim.c	2000/02/02 00:21:10	1.1.1.10
--- remote-sim.c	2000/02/09 08:34:46
***************
*** 22,28 ****
  
  #include "defs.h"
  #include "inferior.h"
! #include "wait.h"
  #include "value.h"
  #include "gdb_string.h"
  #include <ctype.h>
--- 22,28 ----
  
  #include "defs.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include "gdb_string.h"
  #include <ctype.h>
Index: remote-st.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-st.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 remote-st.c
*** remote-st.c	1999/09/22 03:24:57	1.1.1.6
--- remote-st.c	2000/02/09 08:34:48
***************
*** 38,44 ****
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "wait.h"
  #include <signal.h>
  #include "gdb_string.h"
  #include <sys/types.h>
--- 38,44 ----
  #include "defs.h"
  #include "gdbcore.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include <signal.h>
  #include "gdb_string.h"
  #include <sys/types.h>
Index: remote-udi.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-udi.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 remote-udi.c
*** remote-udi.c	2000/02/02 00:21:10	1.1.1.6
--- remote-udi.c	2000/02/09 08:34:51
***************
*** 35,41 ****
  #include "defs.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
--- 35,41 ----
  #include "defs.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "value.h"
  #include <ctype.h>
  #include <fcntl.h>
Index: remote-vx.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-vx.c,v
retrieving revision 1.1.1.6
diff -p -r1.1.1.6 remote-vx.c
*** remote-vx.c	1999/10/12 04:37:24	1.1.1.6
--- remote-vx.c	2000/02/09 08:34:55
***************
*** 22,28 ****
  #include "defs.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
--- 22,28 ----
  #include "defs.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
Index: remote-vx29k.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-vx29k.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-vx29k.c
*** remote-vx29k.c	1999/07/07 20:09:26	1.1.1.2
--- remote-vx29k.c	2000/02/09 08:34:55
***************
*** 26,32 ****
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
--- 26,32 ----
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
Index: remote-vx68.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-vx68.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-vx68.c
*** remote-vx68.c	1999/07/07 20:09:27	1.1.1.2
--- remote-vx68.c	2000/02/09 08:34:55
***************
*** 26,32 ****
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
--- 26,32 ----
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
Index: remote-vx960.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-vx960.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-vx960.c
*** remote-vx960.c	1999/07/07 20:09:28	1.1.1.2
--- remote-vx960.c	2000/02/09 08:34:55
***************
*** 26,32 ****
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
--- 26,32 ----
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
Index: remote-vxmips.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-vxmips.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-vxmips.c
*** remote-vxmips.c	1999/07/07 20:09:29	1.1.1.2
--- remote-vxmips.c	2000/02/09 08:34:55
***************
*** 26,32 ****
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
--- 26,32 ----
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
Index: remote-vxsparc.c
===================================================================
RCS file: /cvs/src/src/gdb/remote-vxsparc.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 remote-vxsparc.c
*** remote-vxsparc.c	1999/07/07 20:09:30	1.1.1.2
--- remote-vxsparc.c	2000/02/09 08:34:55
***************
*** 26,32 ****
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
--- 26,32 ----
  #include "vx-share/regPacket.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  #include "target.h"
  #include "gdbcore.h"
  #include "command.h"
Index: remote.c
===================================================================
RCS file: /cvs/src/src/gdb/remote.c,v
retrieving revision 1.3
diff -p -r1.3 remote.c
*** remote.c	2000/02/09 03:28:18	1.3
--- remote.c	2000/02/09 08:35:06
***************
*** 29,35 ****
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "wait.h"
  /*#include "terminal.h" */
  #include "gdbcmd.h"
  #include "objfiles.h"
--- 29,35 ----
  #include "bfd.h"
  #include "symfile.h"
  #include "target.h"
! #include "gdb_wait.h"
  /*#include "terminal.h" */
  #include "gdbcmd.h"
  #include "objfiles.h"
Index: ser-pipe.c
===================================================================
RCS file: /cvs/src/src/gdb/ser-pipe.c,v
retrieving revision 1.1.1.8
diff -p -r1.1.1.8 ser-pipe.c
*** ser-pipe.c	1999/12/07 03:56:05	1.1.1.8
--- ser-pipe.c	2000/02/09 08:35:06
***************
*** 25,33 ****
  #include "ser-unix.h"
  
  #include <sys/types.h>
! #ifdef HAVE_SYS_WAIT_H
! #include <sys/wait.h>
! #endif
  #include <sys/socket.h>
  #include <sys/time.h>
  #include <fcntl.h>
--- 25,31 ----
  #include "ser-unix.h"
  
  #include <sys/types.h>
! #include "gdb_wait.h"
  #include <sys/socket.h>
  #include <sys/time.h>
  #include <fcntl.h>
Index: ser-unix.c
===================================================================
RCS file: /cvs/src/src/gdb/ser-unix.c,v
retrieving revision 1.1.1.9
diff -p -r1.1.1.9 ser-unix.c
*** ser-unix.c	2000/02/02 00:21:10	1.1.1.9
--- ser-unix.c	2000/02/09 08:35:08
***************
*** 25,33 ****
  #include <fcntl.h>
  #include <sys/types.h>
  #include "terminal.h"
! #ifdef HAVE_SYS_WAIT_H
! #include <sys/wait.h>
! #endif
  #include <sys/socket.h>
  #include <sys/time.h>
  
--- 25,31 ----
  #include <fcntl.h>
  #include <sys/types.h>
  #include "terminal.h"
! #include "gdb_wait.h"
  #include <sys/socket.h>
  #include <sys/time.h>
  
Index: standalone.c
===================================================================
RCS file: /cvs/src/src/gdb/standalone.c,v
retrieving revision 1.1.1.2
diff -p -r1.1.1.2 standalone.c
*** standalone.c	1999/07/07 20:10:20	1.1.1.2
--- standalone.c	2000/02/09 08:35:08
***************
*** 34,40 ****
  #include "symtab.h"
  #include "frame.h"
  #include "inferior.h"
! #include "wait.h"
  
  
  /* Random system calls, mostly no-ops to prevent link problems  */
--- 34,40 ----
  #include "symtab.h"
  #include "frame.h"
  #include "inferior.h"
! #include "gdb_wait.h"
  
  
  /* Random system calls, mostly no-ops to prevent link problems  */
Index: target.c
===================================================================
RCS file: /cvs/src/src/gdb/target.c,v
retrieving revision 1.1.1.20
diff -p -r1.1.1.20 target.c
*** target.c	2000/02/02 00:21:11	1.1.1.20
--- target.c	2000/02/09 08:35:16
***************
*** 30,36 ****
  #include "bfd.h"
  #include "symfile.h"
  #include "objfiles.h"
! #include "wait.h"
  #include <signal.h>
  
  extern int errno;
--- 30,36 ----
  #include "bfd.h"
  #include "symfile.h"
  #include "objfiles.h"
! #include "gdb_wait.h"
  #include <signal.h>
  
  extern int errno;
Index: win32-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/win32-nat.c,v
retrieving revision 1.1.1.10
diff -p -r1.1.1.10 win32-nat.c
*** win32-nat.c	2000/01/11 03:07:26	1.1.1.10
--- win32-nat.c	2000/02/09 08:35:31
***************
*** 28,34 ****
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "wait.h"
  #include "gdbcore.h"
  #include "command.h"
  #include <signal.h>
--- 28,34 ----
  #include "frame.h"		/* required by inferior.h */
  #include "inferior.h"
  #include "target.h"
! #include "gdb_wait.h"
  #include "gdbcore.h"
  #include "command.h"
  #include <signal.h>

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]