diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-08-26 21:42:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-08-26 21:42:11 +0300 |
| commit | 6e9fb70cdf763da6d264932f14f5a67d354ec38d (patch) | |
| tree | 8c9ecd47a5078c8b1c20662853a095523a7b1989 /src/emacs.c | |
| parent | c160274456eb7bb09776b888f5274933f2ec2399 (diff) | |
| download | emacs-6e9fb70cdf763da6d264932f14f5a67d354ec38d.tar.gz emacs-6e9fb70cdf763da6d264932f14f5a67d354ec38d.tar.bz2 emacs-6e9fb70cdf763da6d264932f14f5a67d354ec38d.zip | |
Fix MS-Windows build.
src/callproc.c:
src/emacs.c:
src/filelock.c:
src/process.c:
src/sysdep.c:
src/w32.c: Reshuffle Windows-specific headers to avoid errors with
redefinition of fd_set etc.
src/process.c: Don't use num_pending_connects when
NON_BLOCKING_CONNECT is not defined.
src/sysselect.h: Move definitions of FD_* macros and of SELECT_TYPE
here from w32.h.
src/w32proc.c (sys_select): Adjust the argument types to what
thread.h expects.
nt/inc/sys/socket.h: Include stdint.h. Include sysselect.h instead
of w32.h.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index e6d612b8417..22bca915c7e 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -29,16 +29,18 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <close-stream.h> -#include "lisp.h" - #ifdef WINDOWSNT #include <fcntl.h> #include <sys/socket.h> -#include "w32.h" #include "w32heap.h" #endif +#include "lisp.h" + #if defined WINDOWSNT || defined HAVE_NTGUI +#ifdef WINDOWSNT +#include "w32.h" +#endif #include "w32select.h" #include "w32font.h" #include "w32common.h" |