From: Roland McGrath <roland@gnu.org>
Date: Mon, 10 Oct 1994 04:55:59 +0000 (+0000)
Subject: [! SYSVIPC] (main): Fix uses of FD_* macros: fd_set arg is a pointer,
X-Git-Tag: emacs-19.34~6436
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=86af296ba1ea18617c4fc48efe275646289263a7;p=emacs.git

[! SYSVIPC] (main): Fix uses of FD_* macros: fd_set arg is a pointer,
descriptor arg comes first.
---

diff --git a/lib-src/emacsserver.c b/lib-src/emacsserver.c
index b6d3abbd032..1c8fc1d15ba 100644
--- a/lib-src/emacsserver.c
+++ b/lib-src/emacsserver.c
@@ -1,5 +1,5 @@
 /* Communication subprocess for GNU Emacs acting as server.
-   Copyright (C) 1986, 1987, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1987, 1992, 1994 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -152,12 +152,12 @@ main ()
   for (;;)
     {
       SELECT_TYPE rmask;
-      FD_ZERO (rmask);
-      FD_SET (rmask, 0);
-      FD_SET (rmask, s);
+      FD_ZERO (&rmask);
+      FD_SET (0, &rmask);
+      FD_SET (s, &rmask);
       if (select (s + 1, &rmask, 0, 0, 0) < 0)
 	perror ("select");
-      if (FD_ISSET (rmask, s))	/* client sends list of filenames */
+      if (FD_ISSET (s, &rmask))	/* client sends list of filenames */
 	{
 	  fromlen = sizeof (fromunix);
 	  fromunix.sun_family = AF_UNIX;
@@ -210,7 +210,7 @@ main ()
 	  fflush (infile);
 	  continue;
 	}
-      else if (FD_ISSET (rmask, 0)) /* emacs sends codeword, fd, and string message */
+      else if (FD_ISSET (0, &rmask)) /* emacs sends codeword, fd, and string message */
 	{
 	  /* Read command codeword and fd */
 	  clearerr (stdin);