---------------------
PatchSet 3297 
Date: 2001/11/01 17:35:04
Author: serassio
Branch: cygwin-svc
Tag: (none) 
Log:
Fixed an Automake conflict on WIN32 specific code

Members: 
	src/win32.c:1.1.50.6.2.13->1.1.50.6.2.14 

Index: squid/src/win32.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/win32.c,v
retrieving revision 1.1.50.6.2.13
retrieving revision 1.1.50.6.2.14
diff -u -r1.1.50.6.2.13 -r1.1.50.6.2.14
--- squid/src/win32.c	21 Oct 2001 20:32:01 -0000	1.1.50.6.2.13
+++ squid/src/win32.c	1 Nov 2001 17:35:04 -0000	1.1.50.6.2.14
@@ -61,17 +61,17 @@
 #else
 #define SOFTWARENAME "Squid"
 #endif
-#define VERSION  "2.5"
+#define WIN32_VERSION  "2.5"
 #define COMMANDLINE "CommandLine"
 #define CONFIGFILE  "ConfigFile"
 #define DATABASEPATH "DataBasePath"
-static char REGKEY[256]="SOFTWARE\\"VENDOR"\\"SOFTWARENAME"\\"VERSION"\\";
+static char REGKEY[256]="SOFTWARE\\"VENDOR"\\"SOFTWARENAME"\\"WIN32_VERSION"\\";
 static char TCP_REGKEY[256] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters";
 static char *keys[] = { 
     "SOFTWARE",	    /* key[0] */
     VENDOR,	    /* key[1] */
     SOFTWARENAME,   /* key[2] */
-    VERSION,	    /* key[3] */
+    WIN32_VERSION,  /* key[3] */
     NULL,	    /* key[4] */
     NULL	    /* key[5] */
 };
@@ -521,10 +521,10 @@
 	    /* try to stop the service */
 	    if (ControlService(schService, _WIN_SQUID_SERVICE_CONTROL_STOP,
 		    &svcStatus)) {
-		Sleep(1000);
+		sleep(1);
 		while (QueryServiceStatus(schService, &svcStatus)) {
 		    if (svcStatus.dwCurrentState == SERVICE_STOP_PENDING)
-			Sleep(1000);
+			sleep(1);
 		    else
 			break;
 		}
@@ -693,7 +693,6 @@
     }
     CloseServiceHandle(schSCManager);
 }
-#endif
 
 int main(int argc, char **argv)
 {