--------------------- PatchSet 6235 Date: 2004/06/27 18:50:06 Author: serassio Branch: nt-2_5 Tag: (none) Log: Correct use of USE_WIN32_SERVICE define Members: src/win32.c:1.5.14.19->1.5.14.20 Index: squid/src/win32.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/win32.c,v retrieving revision 1.5.14.19 retrieving revision 1.5.14.20 diff -u -r1.5.14.19 -r1.5.14.20 --- squid/src/win32.c 20 Jun 2004 20:28:47 -0000 1.5.14.19 +++ squid/src/win32.c 27 Jun 2004 18:50:06 -0000 1.5.14.20 @@ -319,7 +319,7 @@ void WIN32_Abort(int sig) { -#ifdef USE_WIN32_SERVICE +#if USE_WIN32_SERVICE svcStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; svcStatus.dwServiceSpecificExitCode = 1; #endif @@ -333,7 +333,7 @@ #ifdef _SQUID_MSWIN_ Win32SockCleanup(); #endif -#ifdef USE_WIN32_SERVICE +#if USE_WIN32_SERVICE if (!Squid_Aborting) { svcStatus.dwCurrentState = SERVICE_STOPPED; SetServiceStatus(svcHandle, &svcStatus); @@ -346,7 +346,7 @@ _exit(0); } -#ifdef USE_WIN32_SERVICE +#if USE_WIN32_SERVICE int WIN32_Subsystem_Init(int * argc, char *** argv) #else int WIN32_Subsystem_Init() @@ -357,7 +357,7 @@ return 1; if (atexit(WIN32_Exit) != 0) return 1; -#ifdef USE_WIN32_SERVICE +#if USE_WIN32_SERVICE if (WIN32_run_mode == _WIN_SQUID_RUN_MODE_SERVICE) { char path[512]; HKEY hndKey; @@ -429,7 +429,7 @@ return 0; } -#ifdef USE_WIN32_SERVICE +#if USE_WIN32_SERVICE void WIN32_svcstatusupdate(DWORD svcstate, DWORD WaitHint) {