[PATCH 4/9] Rely on gnulib's unistd.h replacement.

Pedro Alves
2013-06-27T18:52:35Z

With gnulib's unistd module, we can assume unistd.h is always present, and that
STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO are always defined.

gdb/
2013-06-27 Pedro Alves <palves@redhat.com>

* defs.h: Don't check HAVE_UNISTD_H before including <unistd.h>.
(STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO): Delete.
* tracepoint.c: Don't check HAVE_UNISTD_H before including
<unistd.h>.

gdbserver/
2013-06-27 Pedro Alves <palves@redhat.com>

* event-loop.c: Don't check HAVE_UNISTD_H before including
<unistd.h>.
* gdbreplay.c: Likewise.
* remote-utils.c: Likewise.
* server.c: Likewise.
---
gdb/defs.h | 14 --------------
gdb/gdbserver/event-loop.c | 2 --
gdb/gdbserver/gdbreplay.c | 2 --
gdb/gdbserver/remote-utils.c | 2 --
gdb/gdbserver/server.c | 2 --
gdb/tracepoint.c | 2 --
6 files changed, 24 deletions(-)

diff --git a/gdb/defs.h b/gdb/defs.h
index d8a1adb..f90ca9d 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -52,10 +52,7 @@
#include <stddef.h>
#endif

-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
-
#include <fcntl.h>

/* First include ansidecl.h so we can use the various macro definitions
@@ -766,17 +763,6 @@ extern int use_windows;
#define MERGEPID(PID, TID) ptid_build (PID, TID, 0)
#endif

-/* Define well known filenos if the system does not define them. */
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#endif
-
/* If this definition isn't overridden by the header files, assume
that isatty and fileno exist on this system. */
#ifndef ISATTY
diff --git a/gdb/gdbserver/event-loop.c b/gdb/gdbserver/event-loop.c
index 9e172a9..fbe7898 100644
--- a/gdb/gdbserver/event-loop.c
+++ b/gdb/gdbserver/event-loop.c
@@ -34,9 +34,7 @@
#include <errno.h>
#endif

-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif

typedef struct gdb_event gdb_event;
typedef int (event_handler_func) (gdb_fildes_t);
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index c0d0c8f..5e64f6d 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -41,9 +41,7 @@
#ifdef HAVE_STRING_H
#include <string.h>
#endif
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 3f055cf..5cd6fa1 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -51,9 +51,7 @@
#include <fcntl.h>
#endif
#include <sys/time.h>
-#if HAVE_UNISTD_H
#include <unistd.h>
-#endif
#if HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 4a1d1dc..a172c98 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -22,9 +22,7 @@
#include "notif.h"
#include "tdesc.h"

-#if HAVE_UNISTD_H
#include <unistd.h>
-#endif
#if HAVE_SIGNAL_H
#include <signal.h>
#endif
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index bbba2f8..b8451e5 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -64,9 +64,7 @@
/* readline defines this. */
#undef savestring

-#ifdef HAVE_UNISTD_H
#include <unistd.h>
-#endif

#ifndef O_LARGEFILE
#define O_LARGEFILE 0