X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcris%2Frvdummy.c;h=3b66bb0f043a7216c3dd5ef3c701b37d00e43ece;hb=8b8c7c9f49992750f66f81b4601d593a3858d98c;hp=5eb7df487d8a5dfee7bec86c7c8f7b634cd46239;hpb=9b254dd1ce46c19dde1dde5b8d1e22e862dfacce;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/cris/rvdummy.c b/sim/cris/rvdummy.c
index 5eb7df487d..3b66bb0f04 100644
--- a/sim/cris/rvdummy.c
+++ b/sim/cris/rvdummy.c
@@ -1,7 +1,7 @@
 /* Test-driver for the remote-virtual-component simulator framework
    for GDB, the GNU Debugger.
 
-   Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright 2006-2016 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,14 +30,12 @@ main (int argc, char *argv[])
 #else
 
 #ifdef HAVE_CONFIG_H
-#include "cconfig.h"
-#include "tconfig.h"
+#include "config.h"
 #endif
 
 #include "getopt.h"
 #include "libiberty.h"
 
-#define _GNU_SOURCE
 #include <stdio.h>
 
 #ifdef HAVE_UNISTD_H
@@ -105,7 +103,7 @@ static void handle_input_file (int, char *);
    connection.  Return a file descriptor for the connection or -1 on
    error.  */
 
-int setupsocket (void)
+static int setupsocket (void)
 {
   int s;
   socklen_t len;
@@ -118,7 +116,7 @@ int setupsocket (void)
   memset (&sa_in, 0, sizeof (sa_in));
 
   s = socket (AF_INET, SOCK_STREAM, 0);
-  if (s < 0)
+  if (s == -1)
     return -1;
 
   if (setsockopt (s, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof reuse) != 0)
@@ -517,7 +515,7 @@ main (int argc, char *argv[])
       }
 
   fd = setupsocket ();
-  if (fd < 0)
+  if (fd == -1)
     {
       fprintf (stderr, "%s: problem setting up the connection: %s\n",
 	       progname, strerror (errno));