don't check for string.h or strings.h

[deliverable/binutils-gdb.git] / gdb / gdbserver / gdbreplay.c

diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 47071acfc3901d632375141f939df20446bf6ad5..1f823e0addc59eee8c621d158d189ea8ddeb9e6c 100644 (file)
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -1,6 +1,5 @@
 /* Replay a remote debug session logfile for GDB.
-   Copyright (C) 1996, 1998, 1999, 2000, 2002, 2003, 2005, 2006, 2007, 2008,
-   2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1996-2013 Free Software Foundation, Inc.
    Written by Fred Fish (fnf@cygnus.com) from pieces of gdbserver.
 
    This file is part of GDB.
@@ -19,6 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
+#include "build-gnulib-gdbserver/config.h"
+#include "version.h"
+
 #include <stdio.h>
 #if HAVE_SYS_FILE_H
 #include <sys/file.h>
@@ -36,12 +38,8 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#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
@@ -71,10 +69,6 @@ typedef int socklen_t;
 /* Sort of a hack... */
 #define EOL (EOF - 1)
 
-/* Version information, from version.c.  */
-extern const char version[];
-extern const char host_name[];
-
 static int remote_desc;
 
 #ifdef __MINGW32CE__
@@ -243,7 +237,8 @@ remote_open (char *name)
 
       /* Enable TCP keep alive process. */
       tmp = 1;
-      setsockopt (tmp_desc, SOL_SOCKET, SO_KEEPALIVE, (char *) &tmp, sizeof (tmp));
+      setsockopt (tmp_desc, SOL_SOCKET, SO_KEEPALIVE,
+                 (char *) &tmp, sizeof (tmp));
 
       /* Tell TCP not to delay small packets.  This greatly speeds up
         interactive response. */
@@ -254,8 +249,9 @@ remote_open (char *name)
 #ifndef USE_WIN32API
       close (tmp_desc);                /* No longer need this */
 
-      signal (SIGPIPE, SIG_IGN);       /* If we don't do this, then gdbreplay simply
-                                          exits when the remote side dies.  */
+      signal (SIGPIPE, SIG_IGN);       /* If we don't do this, then
+                                          gdbreplay simply exits when
+                                          the remote side dies.  */
 #else
       closesocket (tmp_desc);  /* No longer need this */
 #endif
@@ -418,8 +414,9 @@ static void
 gdbreplay_version (void)
 {
   printf ("GNU gdbreplay %s%s\n"
-         "Copyright (C) 2011 Free Software Foundation, Inc.\n"
-         "gdbreplay is free software, covered by the GNU General Public License.\n"
+         "Copyright (C) 2013 Free Software Foundation, Inc.\n"
+         "gdbreplay is free software, covered by "
+         "the GNU General Public License.\n"
          "This gdbreplay was configured as \"%s\"\n",
          PKGVERSION, version, host_name);
 }