aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorRoland McGrath1994-10-10 04:55:59 +0000
committerRoland McGrath1994-10-10 04:55:59 +0000
commit86af296ba1ea18617c4fc48efe275646289263a7 (patch)
treee9f0dbc170c0f1c502e6e1cd9efc6250144b363e /lib-src
parent33481b1aec23139ca2e69022331213930155496c (diff)
downloademacs-86af296ba1ea18617c4fc48efe275646289263a7.tar.gz
emacs-86af296ba1ea18617c4fc48efe275646289263a7.zip
[! SYSVIPC] (main): Fix uses of FD_* macros: fd_set arg is a pointer,
descriptor arg comes first.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsserver.c12
1 files changed, 6 insertions, 6 deletions
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 @@
1/* Communication subprocess for GNU Emacs acting as server. 1/* Communication subprocess for GNU Emacs acting as server.
2 Copyright (C) 1986, 1987, 1992 Free Software Foundation, Inc. 2 Copyright (C) 1986, 1987, 1992, 1994 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5
@@ -152,12 +152,12 @@ main ()
152 for (;;) 152 for (;;)
153 { 153 {
154 SELECT_TYPE rmask; 154 SELECT_TYPE rmask;
155 FD_ZERO (rmask); 155 FD_ZERO (&rmask);
156 FD_SET (rmask, 0); 156 FD_SET (0, &rmask);
157 FD_SET (rmask, s); 157 FD_SET (s, &rmask);
158 if (select (s + 1, &rmask, 0, 0, 0) < 0) 158 if (select (s + 1, &rmask, 0, 0, 0) < 0)
159 perror ("select"); 159 perror ("select");
160 if (FD_ISSET (rmask, s)) /* client sends list of filenames */ 160 if (FD_ISSET (s, &rmask)) /* client sends list of filenames */
161 { 161 {
162 fromlen = sizeof (fromunix); 162 fromlen = sizeof (fromunix);
163 fromunix.sun_family = AF_UNIX; 163 fromunix.sun_family = AF_UNIX;
@@ -210,7 +210,7 @@ main ()
210 fflush (infile); 210 fflush (infile);
211 continue; 211 continue;
212 } 212 }
213 else if (FD_ISSET (rmask, 0)) /* emacs sends codeword, fd, and string message */ 213 else if (FD_ISSET (0, &rmask)) /* emacs sends codeword, fd, and string message */
214 { 214 {
215 /* Read command codeword and fd */ 215 /* Read command codeword and fd */
216 clearerr (stdin); 216 clearerr (stdin);