aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/Makefile.in3
-rw-r--r--gdb/remote-fileio.c11
-rw-r--r--gdb/remote-fileio.h4
4 files changed, 15 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8c8b139..4625578 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-10 Andrew Cagney <cagney@redhat.com>
+
+ * remote-fileio.h (REMOTE_FILEIO_H): Replace FILEIO_H.
+ * Makefile.in (remote-fileio.o): Update dependencies.
+ * remote-fileio.c: Include "gdb_wait.h" and "gdb_stat.h". Do not
+ include <setjmp.h>, or <sys/types.h> conditional on USG.
+ (remote_fio_jmp_buf): Delete global variable.
+
2003-06-10 Corinna Vinschen <vinschen@redhat.com>
* Makefile.in: Add dependencies for remote-fileio.o.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a3f0643..7aa80b8 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2155,7 +2155,8 @@ remote.o: remote.c $(defs_h) $(gdb_string_h) $(inferior_h) $(bfd_h) \
$(gdbthread_h) $(remote_h) $(regcache_h) $(value_h) $(gdb_assert_h) \
$(event_loop_h) $(event_top_h) $(inf_loop_h) $(serial_h) \
$(gdbcore_h) $(solib_h) $(remote-fileio_h)
-remote-fileio.o: remote-fileio.c $(defs_h) $(gdb_string_h) $(gdbcmd_h) $(remote_h)
+remote-fileio.o: remote-fileio.c $(defs_h) $(gdb_string_h) $(gdbcmd_h) \
+ $(remote_h) $(gdb_fileio_h) $(gdb_wait_h) $(gdb_stat_h)
rom68k-rom.o: rom68k-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \
$(serial_h) $(regcache_h) $(value_h) $(m68k_tdep_h)
rs6000-nat.o: rs6000-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 5fa387f..abf8e47 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -26,18 +26,14 @@
#include "gdbcmd.h"
#include "remote.h"
#include "gdb/fileio.h"
+#include "gdb_wait.h"
+#include "gdb_stat.h"
-#include <ctype.h>
#include <fcntl.h>
#include <sys/time.h>
-#ifdef USG
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
#ifdef __CYGWIN__
-#include <sys/cygwin.h>
+#include <sys/cygwin.h> /* For cygwin_conv_to_full_posix_path. */
#endif
-#include <setjmp.h>
#include <signal.h>
static struct {
@@ -428,7 +424,6 @@ remote_fileio_to_fio_timeval (struct timeval *tv, struct fio_timeval *ftv)
static int remote_fio_ctrl_c_flag = 0;
static int remote_fio_no_longjmp = 0;
-jmp_buf remote_fio_jmp_buf;
#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
static struct sigaction remote_fio_sa;
diff --git a/gdb/remote-fileio.h b/gdb/remote-fileio.h
index 6edb163..da248ec 100644
--- a/gdb/remote-fileio.h
+++ b/gdb/remote-fileio.h
@@ -21,8 +21,8 @@
/* See the GDB User Guide for details of the GDB remote protocol. */
-#ifndef FILEIO_H
-#define FILEIO_H
+#ifndef REMOTE_FILEIO_H
+#define REMOTE_FILEIO_H
/* Unified interface to remote fileio, called in remote.c from
remote_wait () and remote_async_wait () */