From: Amos Jeffries Date: Fri, 28 Jan 2011 07:58:53 +0000 (+1300) Subject: Windows: fix code wrappers for Cygwin and generic Win32 code X-Git-Tag: take03^2~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be266cb2e2bb2fed6e5141ac3a5aa52e57392ec8;p=thirdparty%2Fsquid.git Windows: fix code wrappers for Cygwin and generic Win32 code _SQUID_WIN32_ was being used to wrap all code built specific for Windows but with any compiler on that platform. - rename to _SQUID_WINDOWS_ to match OS wrpper naming convention. - compact several macros using verbose test: (cygwin or Ming or any) Cleans up all affected tests to match current precompiler code style. Also cleans up all tests involving _SQUID_CYGWN_ to match code styles. --- diff --git a/compat/os/mswin.h b/compat/os/mswin.h index 15beb902f2..2ba94f92c2 100644 --- a/compat/os/mswin.h +++ b/compat/os/mswin.h @@ -34,7 +34,7 @@ #ifndef SQUID_OS_MSWIN_H #define SQUID_OS_MSWIN_H -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #define ACL WindowsACL #if defined(_MSC_VER) /* Microsoft C Compiler ONLY */ @@ -758,5 +758,5 @@ SQUIDCEXTERN size_t getpagesize(void); #define PRINTF_FORMAT_ARG3 #endif -#endif /* _SQUID_WIN32_ */ +#endif /* _SQUID_WINDOWS_ */ #endif /* SQUID_OS_MSWIN_H */ diff --git a/compat/os/windows.h b/compat/os/windows.h index e49fd28c99..05d9bcc3ec 100644 --- a/compat/os/windows.h +++ b/compat/os/windows.h @@ -33,7 +33,7 @@ #ifndef SQUID_OS_WINDOWS_H #define SQUID_OS_WINDOWS_H -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #ifndef ACL #define ACL WindowsACL @@ -45,5 +45,5 @@ #undef _MSWIN_ACL_WAS_NOT_DEFINED #endif -#endif /* _SQUID_WIN32_ */ +#endif /* _SQUID_WINDOWS_ */ #endif /* SQUID_OS_WINDOWS_H */ diff --git a/compat/osdetect.h b/compat/osdetect.h index e5a08904e5..26159829e4 100644 --- a/compat/osdetect.h +++ b/compat/osdetect.h @@ -67,14 +67,14 @@ #elif defined(__CYGWIN32__) || defined(__CYGWIN__) #define _SQUID_CYGWIN_ 1 -#define _SQUID_WIN32_ 1 +#define _SQUID_WINDOWS_ 1 #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32) /* We are using _SQUID_MSWIN_ define in cf.data.pre, so it must be defined to 1 to avoid the build failure of cfgen. */ #define _SQUID_MSWIN_ 1 -#define _SQUID_WIN32_ 1 +#define _SQUID_WINDOWS_ 1 #elif defined(__APPLE__) #define _SQUID_APPLE_ 1 diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.cc b/helpers/basic_auth/RADIUS/basic_radius_auth.cc index f6329c388c..81043b70d3 100644 --- a/helpers/basic_auth/RADIUS/basic_radius_auth.cc +++ b/helpers/basic_auth/RADIUS/basic_radius_auth.cc @@ -63,7 +63,7 @@ #if HAVE_FCNTL_H #include #endif -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #include #endif #if HAVE_CTYPE_H diff --git a/helpers/basic_auth/SSPI/basic_sspi_auth.cc b/helpers/basic_auth/SSPI/basic_sspi_auth.cc index 855c973b71..7bfcf053ef 100644 --- a/helpers/basic_auth/SSPI/basic_sspi_auth.cc +++ b/helpers/basic_auth/SSPI/basic_sspi_auth.cc @@ -36,7 +36,10 @@ #endif /* Check if we try to compile on a Windows Platform */ -#if defined(_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_) +#if !_SQUID_WINDOWS_ +/* NON Windows Platform !!! */ +#error NON WINDOWS PLATFORM +#endif #include "valid.h" @@ -174,9 +177,3 @@ main(int argc, char **argv) } return 0; } - -#else /* NON Windows Platform !!! */ - -#error NON WINDOWS PLATFORM - -#endif diff --git a/helpers/basic_auth/SSPI/valid.cc b/helpers/basic_auth/SSPI/valid.cc index 9e7d901c07..147ac0c5b0 100644 --- a/helpers/basic_auth/SSPI/valid.cc +++ b/helpers/basic_auth/SSPI/valid.cc @@ -30,9 +30,12 @@ #include "util.h" /* Check if we try to compile on a Windows Platform */ -#if defined(_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_) +#if !_SQUID_WINDOWS_ +/* NON Windows Platform !!! */ +#error NON WINDOWS PLATFORM +#endif -#if defined(_SQUID_CYGWIN_) +#if _SQUID_CYGWIN_ #include #endif #include "valid.h" @@ -175,8 +178,3 @@ Valid_User(char *UserName, char *Password, char *Group) } return result; } -#else /* NON Windows Platform !!! */ - -#error NON WINDOWS PLATFORM - -#endif diff --git a/helpers/basic_auth/SSPI/valid.h b/helpers/basic_auth/SSPI/valid.h index 8e8ef50b25..39c599639c 100644 --- a/helpers/basic_auth/SSPI/valid.h +++ b/helpers/basic_auth/SSPI/valid.h @@ -28,7 +28,7 @@ #ifndef _VALID_H_ #define _VALID_H_ -#ifdef _SQUID_CYGWIN_ +#if _SQUID_CYGWIN_ #include #endif #include diff --git a/helpers/external_acl/AD_group/ext_ad_group_acl.cc b/helpers/external_acl/AD_group/ext_ad_group_acl.cc index 9ed185fde5..c45eefae5f 100644 --- a/helpers/external_acl/AD_group/ext_ad_group_acl.cc +++ b/helpers/external_acl/AD_group/ext_ad_group_acl.cc @@ -61,7 +61,7 @@ #include "helpers/defines.h" #include "include/util.h" -#ifdef _SQUID_CYGWIN_ +#if _SQUID_CYGWIN_ #include int _wcsicmp(const wchar_t *, const wchar_t *); #endif diff --git a/helpers/external_acl/LM_group/ext_lm_group_acl.cc b/helpers/external_acl/LM_group/ext_lm_group_acl.cc index 209d008152..5cb49c6231 100644 --- a/helpers/external_acl/LM_group/ext_lm_group_acl.cc +++ b/helpers/external_acl/LM_group/ext_lm_group_acl.cc @@ -72,7 +72,7 @@ #include "include/util.h" -#ifdef _SQUID_CYGWIN_ +#if _SQUID_CYGWIN_ #include int _wcsicmp(const wchar_t *, const wchar_t *); #endif diff --git a/helpers/log_daemon/file/log_file_daemon.cc b/helpers/log_daemon/file/log_file_daemon.cc index 24a7af31c8..48cd3782b9 100644 --- a/helpers/log_daemon/file/log_file_daemon.cc +++ b/helpers/log_daemon/file/log_file_daemon.cc @@ -56,14 +56,14 @@ rotate(const char *path, int rotate_count) i--; snprintf(from, MAXPATHLEN, "%s.%d", path, i - 1); snprintf(to, MAXPATHLEN, "%s.%d", path, i); -#if defined(_SQUID_OS2_) || defined(_SQUID_WIN32_) +#if _SQUID_OS2_ || _SQUID_WINDOWS_ remove(to); #endif rename(from, to); } if (rotate_count > 0) { snprintf(to, MAXPATHLEN, "%s.%d", path, 0); -#if defined(_SQUID_OS2_) || defined(_SQUID_WIN32_) +#if _SQUID_OS2_ || _SQUID_WINDOWS_ remove(to); #endif rename(path, to); diff --git a/include/squid_windows.h b/include/squid_windows.h index 5cf14de504..b9d193b36c 100644 --- a/include/squid_windows.h +++ b/include/squid_windows.h @@ -33,7 +33,7 @@ #ifndef _INC_SQUID_WINDOWS_H #define _INC_SQUID_WINDOWS_H -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #ifndef ACL #define ACL WindowsACL @@ -45,6 +45,5 @@ #undef _MSWIN_ACL_WAS_NOT_DEFINED #endif -#endif /* _SQUID_WIN32_ */ - +#endif /* _SQUID_WINDOWS_ */ #endif /* _INC_SQUID_WINDOWS_H */ diff --git a/include/sspwin32.h b/include/sspwin32.h index bce5f82a5c..d01abafdaf 100644 --- a/include/sspwin32.h +++ b/include/sspwin32.h @@ -34,13 +34,13 @@ #ifndef _LIBSSPWIN32_H_ #define _LIBSSPWIN32_H_ -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #define SECURITY_WIN32 #define NTLM_PACKAGE_NAME "NTLM" #define NEGOTIATE_PACKAGE_NAME "Negotiate" -#ifdef _SQUID_CYGWIN_ +#if _SQUID_CYGWIN_ #include #define _T(x) TEXT(x) #else @@ -77,6 +77,5 @@ const char * WINAPI SSP_MakeNegotiateBlob(PVOID, int, PBOOL, int *, char *); extern BOOL Use_Unicode; extern BOOL NTLM_LocalCall; -#endif /* _SQUID_WIN32_ */ - +#endif /* _SQUID_WINDOWS_ */ #endif /* LIBSSPWIN32_H_ */ diff --git a/lib/rfc1123.c b/lib/rfc1123.c index 51accddc3c..7c0bdb73b2 100644 --- a/lib/rfc1123.c +++ b/lib/rfc1123.c @@ -209,13 +209,7 @@ parse_rfc1123(const char *str) t = mktime(tm); if (t != -1) { time_t dst = 0; -#if defined (_TIMEZONE) -#elif defined (_timezone) -#elif defined(_SQUID_AIX_) -#elif defined(_SQUID_CYGWIN_) -#elif defined(_SQUID_MSWIN_) -#elif defined(_SQUID_SGI_) -#else +#if !(defined(_TIMEZONE) || defined(_timezone) || _SQUID_AIX_ || _SQUID_WINDOWS_ || _SQUID_SGI_) extern long timezone; #endif /* @@ -224,7 +218,7 @@ parse_rfc1123(const char *str) */ if (tm->tm_isdst > 0) dst = -3600; -#if defined ( _timezone) || defined(_SQUID_WIN32_) +#if defined(_timezone) || _SQUID_WINDOWS_ t -= (_timezone + dst); #else t -= (timezone + dst); diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc index 9a7511af5d..45084b4edd 100644 --- a/src/ConfigParser.cc +++ b/src/ConfigParser.cc @@ -75,9 +75,8 @@ ConfigParser::strtokFile(void) return (NULL); } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(wordFile), O_TEXT); - #endif fromFile = 1; diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc index 3ed4d48eb0..99be575f28 100644 --- a/src/DiskIO/AIO/AIODiskFile.cc +++ b/src/DiskIO/AIO/AIODiskFile.cc @@ -86,7 +86,7 @@ void AIODiskFile::open(int flags, mode_t mode, RefCount callback) { /* Simulate async calls */ -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ fd = aio_open(path.termedBuf(), flags); #else fd = file_open(path.termedBuf() , flags); @@ -232,11 +232,9 @@ void AIODiskFile::close () { assert (!closed); -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ aio_close(fd); #else - file_close(fd); #endif diff --git a/src/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc index afcfdae440..6f31515bef 100644 --- a/src/DiskIO/AIO/aio_win32.cc +++ b/src/DiskIO/AIO/aio_win32.cc @@ -37,7 +37,7 @@ #include "comm.h" #include "aio_win32.h" -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ VOID CALLBACK IoCompletionRoutine(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped) { @@ -351,4 +351,4 @@ ssize_t aio_return64(struct aiocb64 * aiocbp) { return aiocbp->aio_sigevent.sigev_signo; } -#endif /* _SQUID_WIN32_ */ +#endif /* _SQUID_WINDOWS_ */ diff --git a/src/DiskIO/AIO/aio_win32.h b/src/DiskIO/AIO/aio_win32.h index 28f5df80be..cea94bacfa 100644 --- a/src/DiskIO/AIO/aio_win32.h +++ b/src/DiskIO/AIO/aio_win32.h @@ -36,7 +36,7 @@ #if USE_DISKIO_AIO -#ifdef _SQUID_CYGWIN_ +#if _SQUID_CYGWIN_ #include "squid_windows.h" #endif diff --git a/src/DiskIO/AIO/async_io.h b/src/DiskIO/AIO/async_io.h index 94626a1fdf..9eefc0891d 100644 --- a/src/DiskIO/AIO/async_io.h +++ b/src/DiskIO/AIO/async_io.h @@ -3,7 +3,7 @@ #if USE_DISKIO_AIO -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #include "aio_win32.h" #else #if HAVE_AIO_H diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc index a05fb97550..2514a8cb3f 100644 --- a/src/acl/HttpStatus.cc +++ b/src/acl/HttpStatus.cc @@ -35,7 +35,7 @@ */ #include "config.h" -#ifdef _SQUID_CYGWIN_ +#if _SQUID_CYGWIN_ #include #endif #include "squid.h" diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 4601feb536..5f7fe174ff 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -419,10 +419,8 @@ parseOneConfigFile(const char *file_name, unsigned int depth) if (fp == NULL) fatalf("Unable to open configuration file: %s: %s", file_name, xstrerror()); -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); - #endif SetConfigFilename(file_name, bool(is_pipe)); diff --git a/src/cache_diff.cc b/src/cache_diff.cc index 94be60f183..3c50a27db2 100644 --- a/src/cache_diff.cc +++ b/src/cache_diff.cc @@ -146,9 +146,8 @@ cacheIndexAddLog(CacheIndex * idx, const char *fname) return 0; } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(file), O_BINARY); - #endif scanned_count = cacheIndexScan(idx, fname, file); diff --git a/src/cf_gen.cc b/src/cf_gen.cc index 95dbc5eeaf..1f94007624 100644 --- a/src/cf_gen.cc +++ b/src/cf_gen.cc @@ -239,7 +239,7 @@ main(int argc, char *argv[]) exit(1); } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); #endif @@ -465,9 +465,8 @@ main(int argc, char *argv[]) exit(1); } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); - #endif fprintf(fp, @@ -501,9 +500,8 @@ main(int argc, char *argv[]) exit(1); } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); - #endif gen_conf(entries, fp, 1); @@ -514,7 +512,7 @@ main(int argc, char *argv[]) perror(conf_filename_short); exit(1); } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); #endif gen_conf(entries, fp, 0); diff --git a/src/comm.cc b/src/comm.cc index f88caff2cb..b92dc8e92f 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -62,7 +62,7 @@ #endif #include "cbdata.h" -#if defined(_SQUID_CYGWIN_) +#if _SQUID_CYGWIN_ #include #endif #ifdef HAVE_NETINET_TCP_H @@ -1661,12 +1661,10 @@ commSetNonBlocking(int fd) int flags; int dummy = 0; #endif -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ int nonblocking = TRUE; -#ifdef _SQUID_CYGWIN_ - +#if _SQUID_CYGWIN_ if (fd_table[fd].type != FD_PIPE) { #endif @@ -1675,8 +1673,7 @@ commSetNonBlocking(int fd) return COMM_ERROR; } -#ifdef _SQUID_CYGWIN_ - +#if _SQUID_CYGWIN_ } else { #endif #endif @@ -1693,10 +1690,8 @@ commSetNonBlocking(int fd) } #endif -#ifdef _SQUID_CYGWIN_ - +#if _SQUID_CYGWIN_ } - #endif fd_table[fd].flags.nonblocking = 1; diff --git a/src/debug.cc b/src/debug.cc index 75bdeb480b..ba79fb8862 100644 --- a/src/debug.cc +++ b/src/debug.cc @@ -255,9 +255,8 @@ debugOpenLog(const char *logfile) debug_log = stderr; } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(debug_log), O_TEXT); - #endif } diff --git a/src/defines.h b/src/defines.h index 1496edf250..f7b283726d 100644 --- a/src/defines.h +++ b/src/defines.h @@ -272,7 +272,7 @@ #define HTTP_REQBUF_SZ 4096 /* CygWin & Windows NT Port */ -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #define _WIN_SQUID_SERVICE_CONTROL_STOP SERVICE_CONTROL_STOP #define _WIN_SQUID_SERVICE_CONTROL_SHUTDOWN SERVICE_CONTROL_SHUTDOWN #define _WIN_SQUID_SERVICE_CONTROL_INTERROGATE SERVICE_CONTROL_INTERROGATE diff --git a/src/disk.cc b/src/disk.cc index b2cb3cdda7..b9b6e503f2 100644 --- a/src/disk.cc +++ b/src/disk.cc @@ -40,7 +40,7 @@ static PF diskHandleRead; static PF diskHandleWrite; -#if defined(_SQUID_WIN32_) || defined(_SQUID_OS2_) +#if _SQUID_WINDOWS_ || _SQUID_OS2_ static int diskWriteIsComplete(int fd) { @@ -110,25 +110,18 @@ file_close(int fd) } if (F->flags.write_daemon) { -#if defined(_SQUID_WIN32_) || defined(_SQUID_OS2_) +#if _SQUID_WINDOWS_ || _SQUID_OS2_ /* * on some operating systems, you can not delete or rename * open files, so we won't allow delayed close. */ - while (!diskWriteIsComplete(fd)) diskHandleWrite(fd, NULL); - #else - F->flags.close_request = 1; - debugs(6, 2, "file_close: FD " << fd << ", delaying close"); - PROF_stop(file_close); - return; - #endif } @@ -522,7 +515,7 @@ int xrename(const char *from, const char *to) { debugs(21, 2, "xrename: renaming " << from << " to " << to); -#if defined (_SQUID_OS2_) || defined (_SQUID_WIN32_) +#if _SQUID_OS2_ || _SQUID_WINDOWS_ remove(to); #endif diff --git a/src/dns_internal.cc b/src/dns_internal.cc index f859e9dcb7..4e16c7274b 100644 --- a/src/dns_internal.cc +++ b/src/dns_internal.cc @@ -59,7 +59,7 @@ using external DNS process. */ #if !USE_DNSSERVERS -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #include "squid_windows.h" #define REG_TCPIP_PARA_INTERFACES "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces" #define REG_TCPIP_PARA "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters" @@ -226,7 +226,7 @@ static void idnsParseNameservers(void); #ifndef _SQUID_MSWIN_ static void idnsParseResolvConf(void); #endif -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ static void idnsParseWIN32Registry(void); static void idnsParseWIN32SearchList(const char *); #endif @@ -364,9 +364,8 @@ idnsParseResolvConf(void) return; } -#if defined(_SQUID_CYGWIN_) +#if _SQUID_CYGWIN_ setmode(fileno(fp), O_TEXT); - #endif while (fgets(buf, RESOLV_BUFSZ, fp)) { @@ -434,7 +433,7 @@ idnsParseResolvConf(void) #endif -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ static void idnsParseWIN32SearchList(const char * Separator) { @@ -1512,20 +1511,16 @@ idnsInit(void) idnsParseResolvConf(); #endif -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ if (0 == nns) idnsParseWIN32Registry(); - #endif if (0 == nns) { debugs(78, 1, "Warning: Could not find any nameservers. Trying to use localhost"); -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ debugs(78, 1, "Please check your TCP-IP settings or /etc/resolv.conf file"); #else - debugs(78, 1, "Please check your /etc/resolv.conf file"); #endif diff --git a/src/enums.h b/src/enums.h index e5ddbfb2a3..0e9a41113d 100644 --- a/src/enums.h +++ b/src/enums.h @@ -326,7 +326,7 @@ enum { /* CygWin & Windows NT Port */ -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ /* * Supported Windows OS types codes */ diff --git a/src/eui/Eui48.cc b/src/eui/Eui48.cc index 7e76de4656..b64cda26a9 100644 --- a/src/eui/Eui48.cc +++ b/src/eui/Eui48.cc @@ -52,8 +52,7 @@ and can be wrapped */ -#if _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ struct arpreq { Ip::Address arp_pa; /* protocol address */ @@ -160,9 +159,9 @@ bool Eui::Eui48::lookup(Ip::Address &c) { struct arpreq arpReq; -#if !_SQUID_WIN32_ +#if !_SQUID_WINDOWS_ struct sockaddr_in *sa = NULL; -#endif /* !_SQUID_WIN32_ */ +#endif /* !_SQUID_WINDOWS_ */ Ip::Address ipAddr = c; ipAddr.SetPort(0); @@ -451,7 +450,7 @@ Eui::Eui48::lookup(Ip::Address &c) set(arpReq.arp_ha.sa_data, 6); return true; -#elif _SQUID_WIN32_ +#elif _SQUID_WINDOWS_ DWORD dwNetTable = 0; diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc index 5937a0fbe7..025139c401 100644 --- a/src/fs/coss/store_dir_coss.cc +++ b/src/fs/coss/store_dir_coss.cc @@ -836,10 +836,9 @@ CossSwapDir::writeCleanDone() /* rename */ if (state->fd >= 0) { -#if defined(_SQUID_OS2_) || defined(_SQUID_WIN32_) +#if _SQUID_OS2_ || _SQUID_WINDOWS_ file_close(state->fd); state->fd = -1; - #endif xrename(state->newLog, state->cur); diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc index 9d514f47e4..09101df3f9 100644 --- a/src/fs/ufs/store_dir_ufs.cc +++ b/src/fs/ufs/store_dir_ufs.cc @@ -986,10 +986,9 @@ UFSSwapDir::writeCleanDone() /* rename */ if (state->fd >= 0) { -#if defined(_SQUID_OS2_) || defined (_SQUID_WIN32_) +#if _SQUID_OS2_ || _SQUID_WINDOWS_ file_close(state->fd); state->fd = -1; - #endif xrename(state->newLog, state->cur); diff --git a/src/globals.h b/src/globals.h index 3fc2007e97..d2195f7a2b 100644 --- a/src/globals.h +++ b/src/globals.h @@ -148,8 +148,7 @@ extern "C" { extern unsigned int WIN32_Socks_initialized; /* 0 */ #endif -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ extern unsigned int WIN32_OS_version; /* 0 */ extern char *WIN32_OS_string; /* NULL */ extern char *WIN32_Service_name; /* NULL */ diff --git a/src/icmp/Icmp4.h b/src/icmp/Icmp4.h index daa34f3d3e..10c869f6ba 100644 --- a/src/icmp/Icmp4.h +++ b/src/icmp/Icmp4.h @@ -46,14 +46,10 @@ #include #endif -#ifndef _SQUID_LINUX_ -#ifndef _SQUID_CYGWIN_ -#ifndef _SQUID_MSWIN_ +#if !_SQUID_LINUX_ && !_SQUID_WINDOWS_ #define icmphdr icmp #define iphdr ip #endif -#endif -#endif /* Linux uses its own field names. */ #if defined (_SQUID_LINUX_) @@ -87,8 +83,7 @@ to use the native Windows port definitions. */ -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ #include "fde.h" #ifdef _SQUID_MSWIN_ diff --git a/src/main.cc b/src/main.cc index 662c6ef629..e29b7b69a2 100644 --- a/src/main.cc +++ b/src/main.cc @@ -966,14 +966,12 @@ mainInitialize(void) debugs(1, 0, "Starting Squid Cache version " << version_string << " for " << CONFIG_HOST_TYPE << "..."); -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) { debugs(1, 0, "Running as " << WIN32_Service_name << " Windows System Service on " << WIN32_OS_string); debugs(1, 0, "Service command line is: " << WIN32_Service_Command_Line); } else debugs(1, 0, "Running on " << WIN32_OS_string); - #endif debugs(1, 1, "Process ID " << getpid()); @@ -1240,8 +1238,7 @@ SquidMain(int argc, char **argv) { ConfigureCurrentKid(argv[0]); -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ int WIN32_init_err; #endif @@ -1260,11 +1257,9 @@ SquidMain(int argc, char **argv) #endif -#ifdef _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ if ((WIN32_init_err = WIN32_Subsystem_Init(&argc, &argv))) return WIN32_init_err; - #endif /* call mallopt() before anything else */ diff --git a/src/mime.cc b/src/mime.cc index cf90d4c5a8..a55801022b 100644 --- a/src/mime.cc +++ b/src/mime.cc @@ -279,9 +279,8 @@ mimeInit(char *filename) return; } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); - #endif mimeFreeMemory(); diff --git a/src/protos.h b/src/protos.h index 7abeb22046..599a9aa311 100644 --- a/src/protos.h +++ b/src/protos.h @@ -732,7 +732,7 @@ SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req); /* CygWin & Windows NT Port */ /* win32.c */ -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ SQUIDCEXTERN int WIN32_Subsystem_Init(int *, char ***); SQUIDCEXTERN void WIN32_sendSignal(int); SQUIDCEXTERN void WIN32_Abort(int); @@ -741,7 +741,7 @@ SQUIDCEXTERN void WIN32_SetServiceCommandLine(void); SQUIDCEXTERN void WIN32_InstallService(void); SQUIDCEXTERN void WIN32_RemoveService(void); SQUIDCEXTERN int SquidMain(int, char **); -#endif /* _SQUID_WIN32_ */ +#endif /* _SQUID_WINDOWS_ */ #ifdef _SQUID_MSWIN_ SQUIDCEXTERN int WIN32_pipe(int[2]); diff --git a/src/squid.h b/src/squid.h index f73691b651..b6298c75d0 100644 --- a/src/squid.h +++ b/src/squid.h @@ -126,7 +126,7 @@ using namespace Squid; #if HAVE_LIMITS_H #include #endif -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #include #endif #if HAVE_SYS_MOUNT_H diff --git a/src/stat.cc b/src/stat.cc index 9ad3d0913d..5d767cf78b 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -673,15 +673,13 @@ DumpInfo(Mgr::InfoActionData& stats, StoreEntry* sentry) storeAppendPrintf(sentry, "Squid Object Cache: Version %s\n", version_string); -#if _SQUID_WIN32_ - +#if _SQUID_WINDOWS_ if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) { storeAppendPrintf(sentry,"\nRunning as %s Windows System Service on %s\n", WIN32_Service_name, WIN32_OS_string); storeAppendPrintf(sentry,"Service command line is: %s\n", WIN32_Service_Command_Line); } else storeAppendPrintf(sentry,"Running on %s\n",WIN32_OS_string); - #endif storeAppendPrintf(sentry, "Start Time:\t%s\n", diff --git a/src/tools.cc b/src/tools.cc index 18729c9bdf..64af91020a 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -997,7 +997,7 @@ setMaxFD(void) void setSystemLimits(void) { -#if HAVE_SETRLIMIT && defined(RLIMIT_NOFILE) && !defined(_SQUID_CYGWIN_) +#if HAVE_SETRLIMIT && defined(RLIMIT_NOFILE) && !_SQUID_CYGWIN_ /* limit system filedescriptors to our own limit */ struct rlimit rl; if (getrlimit(RLIMIT_NOFILE, &rl) < 0) { @@ -1149,9 +1149,8 @@ parseEtcHosts(void) return; } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(fileno(fp), O_TEXT); - #endif while (fgets(buf, 1024, fp)) { /* for each line */ diff --git a/tools/squidclient.cc b/tools/squidclient.cc index 57e982e0f1..f70ed71664 100644 --- a/tools/squidclient.cc +++ b/tools/squidclient.cc @@ -44,7 +44,7 @@ using namespace Squid; /** \endcond */ #endif -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ #include #endif #if HAVE_STDIO_H @@ -400,9 +400,8 @@ main(int argc, char *argv[]) xstrerror()); exit(-1); } -#ifdef _SQUID_WIN32_ +#if _SQUID_WINDOWS_ setmode(put_fd, O_BINARY); - #endif fstat(put_fd, &sb);