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/emacs.c | |
| parent | 39372e1a1032521be74575bb06f95a3898fbae30 (diff) | |
| download | emacs-470e3028d8a741d97349faa8fdeb148d913a49d0.tar.gz emacs-470e3028d8a741d97349faa8fdeb148d913a49d0.tar.bz2 emacs-470e3028d8a741d97349faa8fdeb148d913a49d0.zip | |
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/emacs.c')
| -rw-r--r-- | src/emacs.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/emacs.c b/src/emacs.c index 9dc4e423547..f91e5499916 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -31,20 +31,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <close-stream.h> +#define MAIN_PROGRAM +#include "lisp.h" + #ifdef WINDOWSNT #include <fcntl.h> #include <sys/socket.h> #include <mbstring.h> +#include "w32.h" #include "w32heap.h" #endif -#define MAIN_PROGRAM -#include "lisp.h" - #if defined WINDOWSNT || defined HAVE_NTGUI -#ifdef WINDOWSNT -#include "w32.h" -#endif #include "w32select.h" #include "w32font.h" #include "w32common.h" |