Avoid file name conflict with Windows WinSvc.h (#1637)

There is a conflict between our WinSvc.h header file and
Windows system include <winsvc.h>, which is one of the
factors preventing our ability to build native windows helpers.

diff --git a/src/Makefile.am b/src/Makefile.am
index 79074cbd0a1783a09a2763a3eb2c923de7692724..443449e02b5842a2d63b8e4910f7728e825e116a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,11 +124,11 @@ endif
 WIN32_ALL_SOURCE = \
        win32.h \
        win32.cc \
-       WinSvc.h \
-       WinSvc.cc
+       windows_service.h \
+       windows_service.cc
 if ENABLE_WIN32SPECIFIC
 WIN32_SOURCE = win32.cc
-WINSVC_SOURCE = WinSvc.cc
+WINSVC_SOURCE = windows_service.cc
 else
 WIN32_SOURCE =
 WINSVC_SOURCE =

diff --git a/src/main.cc b/src/main.cc
index 4c19f7e4ab00eaf84f085dc0839f9b147b03b014..3706dd848e3b30a8f6b78ca3455bc042e33147be 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -81,7 +81,7 @@
 #include "unlinkd.h"
 #include "wccp.h"
 #include "wccp2.h"
-#include "WinSvc.h"
+#include "windows_service.h"
 
 #if USE_ADAPTATION
 #include "adaptation/Config.h"

diff --git a/src/WinSvc.cc b/src/windows_service.cc
similarity index 99%
rename from src/WinSvc.cc
rename to src/windows_service.cc
index f9e6634c72553a72e78d8daec394c6ba1a5402e1..121e0d64dda1483915d32ced120fe688c6abc9c9 100644 (file)
--- a/src/WinSvc.cc
+++ b/src/windows_service.cc
@@ -14,7 +14,7 @@
 #include "protos.h"
 #include "SquidConfig.h"
 #include "tools.h"
-#include "WinSvc.h"
+#include "windows_service.h"
 
 #if _SQUID_WINDOWS_
 #if !defined(_MSWSOCK_)

diff --git a/src/WinSvc.h b/src/windows_service.h
similarity index 100%
rename from src/WinSvc.h
rename to src/windows_service.h