Moving getopt.h to src/lib/w32/ broke the Windows build. Fix.

diff --git a/Make.mk b/Make.mk
index 4e0e5feea877151a4e0364356b738394b9484238..272bc58fe8573dec67dc5234ea723fb4cd21f96d 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -144,6 +144,9 @@ cli_distgen := $(acdistcli)
 
 # Compiler flags
 CPPFLAGS += -I$(srcdir)/include -I.
 
 # Compiler flags
 CPPFLAGS += -I$(srcdir)/include -I.

+ifeq ($(empthread),Windows)    # really: W32, regardless of thread package
+CPPFLAGS += -I$(srcdir)/src/lib/w32
+endif

 ifeq ($(have_gcc),yes)
 CFLAGS += -fno-builtin-carg    # conflicts with our carg()
 CFLAGS += -fno-common
 ifeq ($(have_gcc),yes)
 CFLAGS += -fno-builtin-carg    # conflicts with our carg()
 CFLAGS += -fno-common

diff --git a/src/server/main.c b/src/server/main.c
index 5e7c2054295db88b878820a99a33b2b0c16c34e6..f91db585b9bdbe9f8a88d701f55579c891acae5c 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -44,10 +44,10 @@
 #if defined(_WIN32)
 #include <winsock2.h>
 #undef NS_ALL
 #if defined(_WIN32)
 #include <winsock2.h>
 #undef NS_ALL

-#include <process.h>

 #include <direct.h>
 #include <direct.h>

+#include <getopt.h>
+#include <process.h>

 #include "service.h"
 #include "service.h"

-#include "../lib/gen/getopt.h"

 #else
 #include <sys/types.h>
 #include <unistd.h>
 #else
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/src/util/empsched.c b/src/util/empsched.c
index 78e31d5e15003891235a178b05df05b12f8e2b12..4907bd6a1a65ee0d528585a20ff2b5db48ef2032 100644 (file)
--- a/src/util/empsched.c
+++ b/src/util/empsched.c
@@ -34,7 +34,7 @@
 #include <config.h>
 
 #if defined(_WIN32)
 #include <config.h>
 
 #if defined(_WIN32)

-#include "../lib/gen/getopt.h"
+#include <getopt.h>

 #else
 #include <unistd.h>
 #endif
 #else
 #include <unistd.h>
 #endif

diff --git a/src/util/fairland.c b/src/util/fairland.c
index d16d9e1eb17700f5e20530346062a712d291a68d..3b26d894d41e08343b2a5d632a31da6a84fe22c4 100644 (file)
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -67,7 +67,7 @@ static int quiet = 0;
 #define URAN_MIN   56
 
 #if defined(_WIN32)
 #define URAN_MIN   56
 
 #if defined(_WIN32)

-#include "../lib/gen/getopt.h"
+#include <getopt.h>

 #else
 #include <unistd.h>
 #endif
 #else
 #include <unistd.h>
 #endif

diff --git a/src/util/files.c b/src/util/files.c
index d67f506253d9fa8dcdafb7d2166dcaf583ae96df..76489e849cbe09056538420cb1581474748ae611 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -40,8 +40,8 @@
 #include <errno.h>
 #if defined(_WIN32)
 #include <direct.h>
 #include <errno.h>
 #if defined(_WIN32)
 #include <direct.h>

+#include <getopt.h>

 #include <io.h>
 #include <io.h>

-#include "../lib/gen/getopt.h"

 #else
 #include <unistd.h>
 #endif
 #else
 #include <unistd.h>
 #endif