Include <windows.h> from service.h to make it self-contained

Remove now superfluous includes elsewhere.

diff --git a/include/service.h b/include/service.h
index 00c2bb005a12d8dc781ed727252a51dc2a1559cc..49cdfaa37521b3e84d6a0e9dec1f7f8040f380fa 100644 (file)
--- a/include/service.h
+++ b/include/service.h
@@ -34,6 +34,8 @@
 #ifndef SERVICE_H
 #define SERVICE_H
 
 #ifndef SERVICE_H
 #define SERVICE_H
 

+#include <windows.h>
+

 #define DEFAULT_SERVICE_NAME "Empire Server"
 
 extern int install_service(char *program_name, char *service_name,
 #define DEFAULT_SERVICE_NAME "Empire Server"
 
 extern int install_service(char *program_name, char *service_name,

diff --git a/src/lib/w32/service.c b/src/lib/w32/service.c
index f55d35d5591688a3e323be6990faec64b2fe2495..f80b2ecad5f3503abe7c736b4bcb94ba79483e6a 100644 (file)
--- a/src/lib/w32/service.c
+++ b/src/lib/w32/service.c
@@ -33,13 +33,6 @@
 
 #include <config.h>
 
 
 #include <config.h>
 

-/*
- * For WIN32 in empthread.h, winsock2.h is included which interferes
- * with including windows.h, use sys/socket.h instead to prevent a
- * problem
- */
-#include <sys/socket.h>
-

 #include "service.h"
 #include "empthread.h"
 #include "prototypes.h"
 #include "service.h"
 #include "empthread.h"
 #include "prototypes.h"

diff --git a/src/server/main.c b/src/server/main.c
index d4f5c21dc1ae8be6482849738164751674f63844..ca6015812b69ffc057fce7b68c15222a9cd2bb39 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -46,8 +46,6 @@
 #include <unistd.h>
 
 #if defined(_WIN32)
 #include <unistd.h>
 
 #if defined(_WIN32)

-#include <winsock2.h>
-#undef NS_ALL

 #include <process.h>
 #include "service.h"
 #endif
 #include <process.h>
 #include "service.h"
 #endif