XEmacs 21.4.5 "Civil Service".

[chise/xemacs-chise.git.1] / lib-src / gnuslib.c

diff --git a/lib-src/gnuslib.c b/lib-src/gnuslib.c
index 9022d48..ba5a96c 100644 (file)
--- a/lib-src/gnuslib.c
+++ b/lib-src/gnuslib.c
@@ -43,7 +43,7 @@ static int connect_to_ipc_server (void);
 static int connect_to_unix_server (void);
 #endif
 #ifdef INTERNET_DOMAIN_SOCKETS
-static int connect_to_internet_server (char *serverhost, u_short port);
+static int connect_to_internet_server (char *serverhost, unsigned short port);
 #endif
 
 /* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */
@@ -194,7 +194,7 @@ disconnect_from_ipc_server (int s, struct msgbuf *msgp, int echo)
   send_string -- send string to socket.
 */
 void
-send_string (int s, CONST char *msg)
+send_string (int s, const char *msg)
 {
 #if 0
   if (send(s,msg,strlen(msg),0) < 0) {
@@ -313,13 +313,15 @@ static Xauth *server_xauth = NULL;
                                descriptor for server if successful.
 */
 static int
-connect_to_internet_server (char *serverhost, u_short port)
+connect_to_internet_server (char *serverhost, unsigned short port)
 {
   int s;                               /* connected socket descriptor */
   struct servent *sp;                  /* pointer to service information */
   struct sockaddr_in peeraddr_in;      /* for peer socket address */
   char buf[512];                        /* temporary buffer */
 
+  int t;
+
   /* clear out address structures */
   memset((char *)&peeraddr_in,0,sizeof(struct sockaddr_in));
   
@@ -327,10 +329,12 @@ connect_to_internet_server (char *serverhost, u_short port)
   peeraddr_in.sin_family = AF_INET;
 
   /* look up the server host's internet address */
-  if ((peeraddr_in.sin_addr.s_addr = internet_addr(serverhost)) == -1) {
+  if ((t = internet_addr(serverhost)) == -1) {
     fprintf(stderr,"%s: unable to find %s in /etc/hosts or from YP\n",
            progname,serverhost);
     exit(1);
+  } else {
+    peeraddr_in.sin_addr.s_addr = t;
   }; /* if */
   
   if (port == 0) {