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/w32.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/w32.c')
| -rw-r--r-- | src/w32.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/w32.c b/src/w32.c index 0966b8df1ce..93eb6284cf2 100644 --- a/src/w32.c +++ b/src/w32.c @@ -42,8 +42,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <config.h> #include <mbstring.h> /* for _mbspbrk, _mbslwr, _mbsrchr, ... */ -#include <sys/socket.h> - #undef access #undef chdir #undef chmod @@ -205,6 +203,7 @@ typedef struct _REPARSE_DATA_BUFFER { #endif /* TCP connection support. */ +#include <sys/socket.h> #undef socket #undef bind #undef connect |