[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v |
Date: |
Tue, 31 Oct 2006 13:50:35 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 06/10/31 13:50:35
Index: emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- emacsclient.c 31 Oct 2006 09:07:18 -0000 1.79
+++ emacsclient.c 31 Oct 2006 13:50:35 -0000 1.80
@@ -38,6 +38,9 @@
# define INITIALIZE() (initialize_sockets ())
typedef unsigned long IOCTL_BOOL_ARG;
#else
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
# include <netinet/in.h>
# include <sys/ioctl.h>
# define INVALID_SOCKET -1
@@ -486,7 +489,15 @@
return INVALID_SOCKET;
}
+#ifdef O_NONBLOCK
+ IOCTL (s, O_NONBLOCK, &c_arg);
+#else
+#ifdef O_NDELAY
+ IOCTL (s, O_NDELAY, &c_arg);
+#else
IOCTL (s, FIONBIO, &c_arg);
+#endif
+#endif
setsockopt (s, SOL_SOCKET, SO_LINGER, (char *) &l_arg, sizeof l_arg);
/*