diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2010-09-20 02:18:18 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-09-20 02:18:18 +0200 |
| commit | b761835db20e95737c1f8e7c63b13c7d458ccf89 (patch) | |
| tree | cb59077e10fed6a0c14de701132c10eb265d0633 /src/w32proc.c | |
| parent | 5caecbd2496afcb06e0c9af00f4dff3e6d268d40 (diff) | |
| download | emacs-b761835db20e95737c1f8e7c63b13c7d458ccf89.tar.gz | |
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.
Diffstat (limited to 'src/w32proc.c')
| -rw-r--r-- | src/w32proc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/w32proc.c b/src/w32proc.c index af923723709..ae4e725b6ef 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -1694,8 +1694,6 @@ set_process_dir (char * dir) 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 @@ socket connections still exist. */) 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 @@ syms_of_ntproc (void) 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); |