Windows: shuffle win32lib into libcompat

diff --git a/compat/Makefile.am b/compat/Makefile.am
index f3e11fb387c7968652674376818681d508ec0336..cb60e695802f1dd4e1238778dfdd5b2156dc33e2 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -56,8 +56,9 @@ libcompat_squid_a_SOURCES = \
        os/freebsd.h \
        os/hpux.h \
        os/linux.h \
-       os/mswin.h \
        os/macosx.h \
+       os/mswin.h \
+       mswin.cc \
        os/netbsd.h \
        os/next.h \
        os/openbsd.h \

diff --git a/lib/win32lib.c b/compat/mswin.cc
similarity index 99%
rename from lib/win32lib.c
rename to compat/mswin.cc
index 41ad5b78cda3bd01b2ebb0912ac15239aa8ab2fc..7538299ea7506ab4f7a7c5d57d0524d446bc1fb8 100644 (file)
--- a/lib/win32lib.c
+++ b/compat/mswin.cc
@@ -38,8 +38,8 @@
 #include "util.h"
 
 /* The following code section is part of an EXPERIMENTAL native */
-/* Windows NT/2000 Squid port - Compiles only on MS Visual C++  */
-#if defined(_SQUID_MSWIN_)
+/* Windows NT/2000 Squid port - Compiles only on MS Visual C++ or MinGW */
+#if _SQUID_MSWIN_ || _SQUID_MINGW_
 
 #undef strerror
 #define sys_nerr _sys_nerr

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 11bbba253f8e0df13c6e2803747bea1bcae814de..1dcf63564b84f0a0b23e71b6d440d98ba827cbc8 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,10 +20,8 @@ install-strip: all
 
 if ENABLE_WIN32SPECIFIC
 LIBSSPWIN32=libsspwin32.la
-WIN32SRC = win32lib.c
 else
 LIBSSPWIN32=
-WIN32SRC=
 EXTRA_LTLIBRARIES = \
        libsspwin32.la
 endif
@@ -40,8 +38,7 @@ noinst_LTLIBRARIES = \
 EXTRA_libmiscutil_la_SOURCES = \
        dirent.c \
        encrypt.c \
-       getopt.c \
-       win32lib.c
+       getopt.c
 
 libmiscencoding_la_SOURCES = \
        base64.c \
@@ -72,8 +69,7 @@ libmiscutil_la_SOURCES = \
        Splay.cc \
        stub_memaccount.c \
        util.c \
-       xusleep.c \
-       $(WIN32SRC)
+       xusleep.c
 
 # $(top_srcdir)/include/version.h should be a dependency
 libsspwin32_la_SOURCES = \