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

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"