diff src/w32proc.c @ 110431:9fe8167bbd9b

Don't make W32 code conditional on HAVE_SOCKETS, it's always defined. * w32.c: Remove top-level uses of #ifdef HAVE_SOCKETS. (gethostname) [!HAVE_SOCKETS]: Remove. (SOCK_REPLACE_HANDLE): Remove macro. (socket_to_fd, sys_close, _sys_read_ahead, sys_read, sys_write) (term_ntproc, init_ntproc): Don't conditionalize on HAVE_SOCKETS. * w32proc.c: Remove top-level uses of #ifdef HAVE_SOCKETS. (syms_of_ntproc): Don't conditionalize on HAVE_SOCKETS.
author Juanma Barranquero <lekktu@gmail.com>
date Mon, 20 Sep 2010 02:18:18 +0200
parents 8cfee7d2955f
children e0ac9a58795e
line wrap: on
line diff
--- a/src/w32proc.c	Sun Sep 19 11:48:11 2010 -0700
+++ b/src/w32proc.c	Mon Sep 20 02:18:18 2010 +0200
@@ -1694,8 +1694,6 @@
   process_dir = dir;
 }
 
-#ifdef HAVE_SOCKETS
-
 /* To avoid problems with winsock implementations that work over dial-up
    connections causing or requiring a connection to exist while Emacs is
    running, Emacs no longer automatically loads winsock on startup if it
@@ -1759,8 +1757,6 @@
   return term_winsock () ? Qt : Qnil;
 }
 
-#endif /* HAVE_SOCKETS */
-
 
 /* Some miscellaneous functions that are Windows specific, but not GUI
    specific (ie. are applicable in terminal or batch mode as well).  */
@@ -2268,10 +2264,9 @@
   DEFSYM (Qhigh, "high");
   DEFSYM (Qlow, "low");
 
-#ifdef HAVE_SOCKETS
   defsubr (&Sw32_has_winsock);
   defsubr (&Sw32_unload_winsock);
-#endif
+
   defsubr (&Sw32_short_file_name);
   defsubr (&Sw32_long_file_name);
   defsubr (&Sw32_set_process_priority);