[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: |
Thu, 02 Nov 2006 09:54:09 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 06/11/02 09:54:09
Index: emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- emacsclient.c 1 Nov 2006 19:26:14 -0000 1.82
+++ emacsclient.c 2 Nov 2006 09:54:09 -0000 1.83
@@ -32,28 +32,23 @@
# include <stdlib.h>
# define HAVE_SOCKETS
+# define HAVE_INET_SOCKETS
# define NO_SOCKETS_IN_FILE_SYSTEM
# define HSOCKET SOCKET
# define CLOSE_SOCKET closesocket
-# define IOCTL ioctlsocket
# define INITIALIZE() (initialize_sockets ())
-typedef unsigned long IOCTL_BOOL_ARG;
#else /* !WINDOWSNT */
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+# ifdef HAVE_INET_SOCKETS
# include <netinet/in.h>
-# include <sys/ioctl.h>
+# endif
# define INVALID_SOCKET -1
# define HSOCKET int
# define CLOSE_SOCKET close
-# define IOCTL ioctl
# define INITIALIZE()
-typedef int IOCTL_BOOL_ARG;
#endif /* !WINDOWSNT */
@@ -271,7 +266,7 @@
}
-#if !defined (HAVE_SOCKETS)
+#if !defined (HAVE_SOCKETS) || !defined (HAVE_INET_SOCKETS)
int
main (argc, argv)
@@ -285,7 +280,7 @@
fail (argc, argv);
}
-#else /* HAVE_SOCKETS */
+#else /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
#ifdef WINDOWSNT
# include <winsock2.h>
@@ -469,7 +464,6 @@
{
HSOCKET s;
struct sockaddr_in server;
- IOCTL_BOOL_ARG c_arg = 0;
struct linger l_arg = {1, 1};
char auth_string[AUTH_KEY_LENGTH + 1];
@@ -498,15 +492,6 @@
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);
/*
@@ -818,7 +803,7 @@
return EXIT_SUCCESS;
}
-#endif /* HAVE_SOCKETS */
+#endif /* HAVE_SOCKETS && HAVE_INET_SOCKETS */
#ifndef HAVE_STRERROR
char *
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/01
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v,
Juanma Barranquero <=
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/03
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/06
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/07
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/07
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/07
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/10
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/22
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/22
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Juanma Barranquero, 2006/11/24
- [Emacs-diffs] Changes to emacs/lib-src/emacsclient.c,v, Eli Zaretskii, 2006/11/24