From 74b72cfaae2ad95c228f5f9fa12acb472fc8f205 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sat, 28 Jan 2012 18:33:12 +0100 Subject: [PATCH] Changed _SQUID_MSWIN_ to _SQUID_WINDOWS_ everywhere. --- src/ssl/support.h | 4 ++-- src/store_dir.cc | 6 +++--- src/tools.cc | 6 +++--- src/unlinkd.cc | 6 +++--- src/win32.cc | 2 +- tools/cachemgr.cc | 14 +++++++------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/ssl/support.h b/src/ssl/support.h index c84b4cf460..a613e52d82 100644 --- a/src/ssl/support.h +++ b/src/ssl/support.h @@ -169,7 +169,7 @@ int asn1timeToString(ASN1_TIME *tm, char *buf, int len); bool setClientSNI(SSL *ssl, const char *fqdn); } //namespace Ssl -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ #if defined(__cplusplus) @@ -197,6 +197,6 @@ int SSL_set_fd(SSL *ssl, int fd) #endif /* __cplusplus */ -#endif /* _SQUID_MSWIN_ */ +#endif /* _SQUID_WINDOWS_ */ #endif /* SQUID_SSL_SUPPORT_H */ diff --git a/src/store_dir.cc b/src/store_dir.cc index 5303ce3864..7d1404df92 100644 --- a/src/store_dir.cc +++ b/src/store_dir.cc @@ -116,7 +116,7 @@ StoreController::createOneStore(Store &aStore) * The following is a workaround for create store directories sequentially * when running on native Windows port. */ -#if !_SQUID_MSWIN_ +#if !_SQUID_WINDOWS_ if (fork()) return; @@ -125,7 +125,7 @@ StoreController::createOneStore(Store &aStore) aStore.create(); -#if !_SQUID_MSWIN_ +#if !_SQUID_WINDOWS_ exit(0); @@ -137,7 +137,7 @@ StoreController::create() { swapDir->create(); -#if !_SQUID_MSWIN_ +#if !_SQUID_WINDOWS_ pid_t pid; diff --git a/src/tools.cc b/src/tools.cc index c8c3ebc4fd..730b91f63a 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -395,7 +395,7 @@ death(int sig) #endif #endif /* PRINT_STACK_TRACE */ -#if SA_RESETHAND == 0 && !_SQUID_MSWIN_ +#if SA_RESETHAND == 0 && !_SQUID_WINDOWS_ signal(SIGSEGV, SIG_DFL); signal(SIGBUS, SIG_DFL); @@ -585,7 +585,7 @@ debug_trap(const char *message) void sig_child(int sig) { -#if !_SQUID_MSWIN_ +#if !_SQUID_WINDOWS_ #if _SQUID_NEXT_ union wait status; #else @@ -1125,7 +1125,7 @@ squid_signal(int sig, SIGHDLR * func, int flags) debugs(50, DBG_CRITICAL, "sigaction: sig=" << sig << " func=" << func << ": " << xstrerror()); #else -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ /* On Windows, only SIGINT, SIGILL, SIGFPE, SIGTERM, SIGBREAK, SIGABRT and SIGSEGV signals are supported, so we must care of don't call signal() for other value. diff --git a/src/unlinkd.cc b/src/unlinkd.cc index 23c7074a1a..8576dd7c20 100644 --- a/src/unlinkd.cc +++ b/src/unlinkd.cc @@ -144,7 +144,7 @@ unlinkdUnlink(const char *path) void unlinkdClose(void) -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ { if (unlinkd_wfd > -1) { @@ -219,7 +219,7 @@ unlinkdInit(void) #if USE_POLL && _SQUID_OSF_ /* pipes and poll() don't get along on DUNIX -DW */ IPC_STREAM, -#elif _SQUID_MSWIN_ +#elif _SQUID_WINDOWS_ /* select() will fail on a pipe */ IPC_TCP_SOCKET, #else @@ -260,7 +260,7 @@ unlinkdInit(void) debugs(2, 1, "Unlinkd pipe opened on FD " << unlinkd_wfd); -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ debugs(2, 4, "Unlinkd handle: 0x" << std::hex << hIpc << std::dec << ", PID: " << pid); diff --git a/src/win32.cc b/src/win32.cc index af8a0a3efb..23159036d9 100644 --- a/src/win32.cc +++ b/src/win32.cc @@ -35,7 +35,7 @@ #include "squid-old.h" -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ #if HAVE_WIN32_PSAPI #include #endif diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index 0aabb5bbc4..d2b75bf706 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -165,7 +165,7 @@ static const char *make_auth_header(const cachemgr_request * req); static int check_target_acl(const char *hostname, int port); -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ static int s_iInitCount = 0; int Win32SockInit(void) @@ -609,7 +609,7 @@ static int read_reply(int s, cachemgr_request * req) { char buf[4 * 1024]; -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ int reply; char *tmpfile = tempnam(NULL, "tmp0000"); @@ -633,7 +633,7 @@ read_reply(int s, cachemgr_request * req) parse_menu = 1; if (fp == NULL) { -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ perror(tmpfile); xfree(tmpfile); #else @@ -645,7 +645,7 @@ read_reply(int s, cachemgr_request * req) return 1; } -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ while ((reply=recv(s, buf , sizeof(buf), 0)) > 0) fwrite(buf, 1, reply, fp); @@ -784,7 +784,7 @@ read_reply(int s, cachemgr_request * req) } fclose(fp); -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ remove(tmpfile); xfree(tmpfile); @@ -899,7 +899,7 @@ main(int argc, char *argv[]) cachemgr_request *req; now = time(NULL); -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ Win32SockInit(); atexit(Win32SockCleanup); @@ -1007,7 +1007,7 @@ read_request(void) else return NULL; -#if _SQUID_MSWIN_ +#if _SQUID_WINDOWS_ if (strlen(buf) == 0 || strlen(buf) == 4000) #else -- 2.47.2