fix RCS Id strings

[moira.git] / gdb / gdb_conn.c

diff --git a/gdb/gdb_conn.c b/gdb/gdb_conn.c
index bb263b854f0533dd9b09152dcca6fb28e548dac4..ba5b5c7a9d0f2d8696484b1e74f14e587b0b1e6e 100644 (file)
--- a/gdb/gdb_conn.c
+++ b/gdb/gdb_conn.c
@@ -5,7 +5,7 @@
 
 #ifndef lint
 static char *rcsid_gdb_conn_c = "$Header$";
-#endif lint
+#endif
 
 /************************************************************************
  *     
@@ -27,6 +27,7 @@ static char *rcsid_gdb_conn_c = "$Header$";
 
 #include <mit-copyright.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include "gdb.h"
 #include <sys/types.h>
@@ -39,11 +40,11 @@ static char *rcsid_gdb_conn_c = "$Header$";
 #ifdef SOLARIS
 #include <sys/filio.h>
 #endif /* SOLARIS */
+#ifdef POSIX
+#include <unistd.h>
+#endif
 
 extern int errno;
-#ifdef vax
-extern u_short htons();                        /* ?? All versions?  */
-#endif vax
 
 CONNECTION gdb_allocate_connection();
 
@@ -274,7 +275,7 @@ char *id;
 {
        int peer;                               /* socket for talking to
                                                   peer */
-       int on = 1;                             /* flag for ioctl */
+       char on = 1;                            /* flag for ioctl */
        struct sockaddr_in target;              /* build the peer address */
                                                /* here */
        struct hostent *peer_host;              /* host where peer is */
@@ -579,7 +580,7 @@ char *id;
                                                /* of pending non-accepted */
                                                /* cons.*/
        fromlen = sizeof(from);
-       peer = accept(slisten, &from, &fromlen);
+       peer = accept(slisten, (struct sockaddr *)&from, &fromlen);
        if (peer < 0) {
                g_stop_with_errno(con);
                gdb_perror("gdb_try_accepting: error accepting connection");
@@ -653,9 +654,9 @@ CONNECTION con;
                con->status = CON_UP;
        else
                con->status = CON_STOPPED;
-#else !VERIFY_PROTOCOL
+#else
        con->status = CON_UP;
-#endif !VERIFY_PROTOCOL
+#endif
 }
 
 
@@ -707,7 +708,7 @@ CONNECTION con;
                g_stop_with_errno(con);
                return;
        }
-#else   !VERIFY_PROTOCOL
+#else
        con->status = CON_UP;
 #endif
 }