diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-11-02 19:04:06 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-11-02 19:04:06 +0200 |
| commit | 470e3028d8a741d97349faa8fdeb148d913a49d0 (patch) | |
| tree | d194711816fd6bc66726b0917ae74ef3116f38b1 /src/sysdep.c | |
| parent | 39372e1a1032521be74575bb06f95a3898fbae30 (diff) | |
| download | emacs-470e3028d8a741d97349faa8fdeb148d913a49d0.tar.gz | |
Fix the MS-Windows build
* src/thread.h [WINDOWSNT]: Include sys/socket.h.
* src/sysselect.h: Don't define fd_set and FD_* macros for
MS-Windows here.
* src/w32.h: Define them here.
* src/process.h (sys_select): Declare prototype.
* src/sysdep.c:
* src/process.c:
* src/filelock.c:
* src/emacs.c:
* src/callproc.c: Move inclusion of sys/select.h after lisp.h.
* nt/inc/socket.h: Include w32.h instead of sysselect.h
Diffstat (limited to 'src/sysdep.c')
| -rw-r--r-- | src/sysdep.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/sysdep.c b/src/sysdep.c index ba6be57278e..d75dcd3f9e3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -39,17 +39,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <c-ctype.h> #include <utimens.h> -#ifdef HAVE_SOCKETS -#include <sys/socket.h> -#include <netdb.h> -#endif /* HAVE_SOCKETS */ - -#ifdef TRY_AGAIN -#ifndef HAVE_H_ERRNO -extern int h_errno; -#endif -#endif /* TRY_AGAIN */ - #include "lisp.h" #include "sysselect.h" #include "blockinput.h" @@ -68,6 +57,17 @@ extern int h_errno; # include <math.h> #endif +#ifdef HAVE_SOCKETS +#include <sys/socket.h> +#include <netdb.h> +#endif /* HAVE_SOCKETS */ + +#ifdef TRY_AGAIN +#ifndef HAVE_H_ERRNO +extern int h_errno; +#endif +#endif /* TRY_AGAIN */ + #ifdef WINDOWSNT #define read sys_read #define write sys_write |