--------------------- PatchSet 3764 Date: 2002/03/27 21:01:10 Author: serassio Branch: nt-2_5 Tag: (none) Log: Added Pinger helper support Members: lib/rfc1123.c:1.6->1.6.14.1 port/win32/PerlPreprocessing.dsp:1.1.2.1->1.1.2.2 port/win32/auth_modules.cmd:1.1.2.1->1.1.2.2 port/win32/cf_data.dsp:1.1.2.1->1.1.2.2 port/win32/default_config_file.cmd:1.1->1.1.2.1 port/win32/modules.dsp:1.1.2.2->1.1.2.3 port/win32/repl_modules.cmd:1.1.2.1->1.1.2.2 port/win32/squid.dsw:1.1.2.4->1.1.2.5 port/win32/squid_conf_default.dsp:1.1.2.2->1.1.2.3 port/win32/squid_mswin.mak:1.1.2.3->1.1.2.4 port/win32/store_modules.cmd:1.1.2.1->1.1.2.2 port/win32/update.cmd:1.1.2.1->1.1.2.2 port/win32/LDAP_auth/LDAP_auth.dsp:1.1.2.1->1.1.2.2 port/win32/cachemgr/cachemgr.dsp:1.1.2.1->1.1.2.2 port/win32/cf_gen/cf_gen.dsp:1.1.2.1->1.1.2.2 port/win32/fake_auth/fake_auth.dsp:1.1.2.1->1.1.2.2 port/win32/include/autoconf.h:1.1.2.2->1.1.2.3 port/win32/include/squid-mswin.h:1.1.2.3->1.1.2.4 port/win32/libawin32/libawin32.dsp:1.1.2.1->1.1.2.2 port/win32/libbasic/libbasic.dsp:1.1.2.1->1.1.2.2 port/win32/libgnuregex/libgnuregex.dsp:1.1.2.1->1.1.2.2 port/win32/libheap/libheap.dsp:1.1.2.1->1.1.2.2 port/win32/liblru/liblru.dsp:1.1.2.1->1.1.2.2 port/win32/libmiscutil/libmiscutil.dsp:1.1.2.1->1.1.2.2 port/win32/libntlm/libntlm.dsp:1.1.2.1->1.1.2.2 port/win32/libntlmauth/libntlmauth.dsp:1.1.2.1->1.1.2.2 port/win32/libsnmp/libsnmp.dsp:1.1.2.1->1.1.2.2 port/win32/libufs/libufs.dsp:1.1.2.1->1.1.2.2 port/win32/nt_auth/nt_auth.dsp:1.1.2.1->1.1.2.2 port/win32/pinger/pinger.dsp:1.1->1.1.2.1 port/win32/squid/squid.dsp:1.1.2.3->1.1.2.4 port/win32/squidclient/squidclient.dsp:1.1.2.1->1.1.2.2 port/win32/unlinkd/unlinkd.dsp:1.1.2.1->1.1.2.2 src/cache_manager.c:1.7->1.7.62.1 src/cf.data.pre:1.49.2.5->1.49.2.5.4.1 src/comm_select.c:1.8.10.2->1.8.10.3 src/debug.c:1.9.10.3->1.9.10.4 src/defines.h:1.15.10.1->1.15.10.2 src/globals.h:1.14.14.1->1.14.14.2 src/icmp.c:1.4->1.4.74.1 src/ipc.c:1.7.10.2->1.7.10.3 src/main.c:1.28.6.1.4.1->1.28.6.1.4.2 src/pinger.c:1.4->1.4.74.1 src/squid.h:1.13.6.2.4.1->1.13.6.2.4.2 src/store_dir.c:1.19.14.1->1.19.14.2 src/store_io.c:1.3.14.1->1.3.14.2 src/structs.h:1.48.6.1->1.48.6.2 src/tools.c:1.19.14.1->1.19.14.2 src/unlinkd.c:1.6.10.2->1.6.10.3 src/win32.c:1.5.14.2->1.5.14.3 src/fs/Makefile.am:1.2->1.2.40.1 src/fs/ufs/store_dir_ufs.c:1.21.6.1.4.3->1.21.6.1.4.4 Index: squid/lib/rfc1123.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/rfc1123.c,v retrieving revision 1.6 retrieving revision 1.6.14.1 diff -u -r1.6 -r1.6.14.1 --- squid/lib/rfc1123.c 18 Oct 2001 20:52:10 -0000 1.6 +++ squid/lib/rfc1123.c 27 Mar 2002 21:01:10 -0000 1.6.14.1 @@ -1,6 +1,6 @@ /* - * $Id: rfc1123.c,v 1.6 2001/10/18 20:52:10 squidadm Exp $ + * $Id: rfc1123.c,v 1.6.14.1 2002/03/27 21:01:10 serassio Exp $ * * DEBUG: * AUTHOR: Harvest Derived @@ -260,6 +260,7 @@ #elif defined (_timezone) #elif defined(_SQUID_AIX_) #elif defined(_SQUID_CYGWIN_) +#elif defined(_SQUID_MSWIN_) #else extern time_t timezone; #endif @@ -269,7 +270,7 @@ */ if (tm->tm_isdst > 0) dst = -3600; -#if defined ( _timezone) || defined(_SQUID_CYGWIN_) +#if defined ( _timezone) || defined(_SQUID_CYGWIN_) || defined(_SQUID_MSWIN_) t -= (_timezone + dst); #else t -= (timezone + dst); Index: squid/port/win32/PerlPreprocessing.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/PerlPreprocessing.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/PerlPreprocessing.dsp 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/PerlPreprocessing.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,129 +1,129 @@ -# Microsoft Developer Studio Project File - Name="PerlPreprocessing" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Generic Project" 0x010a - -CFG=PerlPreprocessing - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "PerlPreprocessing.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "PerlPreprocessing.mak" CFG="PerlPreprocessing - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "PerlPreprocessing - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "PerlPreprocessing - Win32 Debug" (based on "Win32 (x86) Generic Project") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -MTL=midl.exe - -!IF "$(CFG)" == "PerlPreprocessing - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "." -# PROP Intermediate_Dir "." -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "PerlPreprocessing - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "." -# PROP Intermediate_Dir "." -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "PerlPreprocessing - Win32 Release" -# Name "PerlPreprocessing - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\enums.h - -!IF "$(CFG)" == "PerlPreprocessing - Win32 Release" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -InputDir=\WORK\CYGWIN-SVC-2_5\src -InputPath=..\..\src\enums.h - -"$(InputDir)\string_arrays.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - perl $(InputDir)\mk-string-arrays.pl <$(InputPath) >$(InputDir)\string_arrays.c - -# End Custom Build - -!ELSEIF "$(CFG)" == "PerlPreprocessing - Win32 Debug" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -InputDir=\WORK\CYGWIN-SVC-2_5\src -InputPath=..\..\src\enums.h - -"$(InputDir)\string_arrays.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - perl $(InputDir)\mk-string-arrays.pl <$(InputPath) >$(InputDir)\string_arrays.c - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\..\src\globals.h - -!IF "$(CFG)" == "PerlPreprocessing - Win32 Release" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -InputDir=\WORK\CYGWIN-SVC-2_5\src -InputPath=..\..\src\globals.h - -"$(InputDir)\globals.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - perl $(InputDir)\mk-globals-c.pl <$(InputPath) >$(InputDir)\globals.c - -# End Custom Build - -!ELSEIF "$(CFG)" == "PerlPreprocessing - Win32 Debug" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -InputDir=\WORK\CYGWIN-SVC-2_5\src -InputPath=..\..\src\globals.h - -"$(InputDir)\globals.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - perl $(InputDir)\mk-globals-c.pl <$(InputPath) >$(InputDir)\globals.c - -# End Custom Build - -!ENDIF - -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="PerlPreprocessing" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Generic Project" 0x010a + +CFG=PerlPreprocessing - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "PerlPreprocessing.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "PerlPreprocessing.mak" CFG="PerlPreprocessing - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "PerlPreprocessing - Win32 Release" (based on "Win32 (x86) Generic Project") +!MESSAGE "PerlPreprocessing - Win32 Debug" (based on "Win32 (x86) Generic Project") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +MTL=midl.exe + +!IF "$(CFG)" == "PerlPreprocessing - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "." +# PROP Intermediate_Dir "." +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "PerlPreprocessing - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "." +# PROP Intermediate_Dir "." +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "PerlPreprocessing - Win32 Release" +# Name "PerlPreprocessing - Win32 Debug" +# Begin Source File + +SOURCE=..\..\src\enums.h + +!IF "$(CFG)" == "PerlPreprocessing - Win32 Release" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputDir=\WORK\CYGWIN-SVC-2_5\src +InputPath=..\..\src\enums.h + +"$(InputDir)\string_arrays.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + perl $(InputDir)\mk-string-arrays.pl <$(InputPath) >$(InputDir)\string_arrays.c + +# End Custom Build + +!ELSEIF "$(CFG)" == "PerlPreprocessing - Win32 Debug" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputDir=\WORK\CYGWIN-SVC-2_5\src +InputPath=..\..\src\enums.h + +"$(InputDir)\string_arrays.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + perl $(InputDir)\mk-string-arrays.pl <$(InputPath) >$(InputDir)\string_arrays.c + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\src\globals.h + +!IF "$(CFG)" == "PerlPreprocessing - Win32 Release" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputDir=\WORK\CYGWIN-SVC-2_5\src +InputPath=..\..\src\globals.h + +"$(InputDir)\globals.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + perl $(InputDir)\mk-globals-c.pl <$(InputPath) >$(InputDir)\globals.c + +# End Custom Build + +!ELSEIF "$(CFG)" == "PerlPreprocessing - Win32 Debug" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +InputDir=\WORK\CYGWIN-SVC-2_5\src +InputPath=..\..\src\globals.h + +"$(InputDir)\globals.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + perl $(InputDir)\mk-globals-c.pl <$(InputPath) >$(InputDir)\globals.c + +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project Index: squid/port/win32/auth_modules.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/auth_modules.cmd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/auth_modules.cmd 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/auth_modules.cmd 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,16 +1,16 @@ -@echo off -if exist %temp%\auth_modules.txt del %temp%\auth_modules.txt -:loop -echo %1 >> %temp%\auth_modules.txt -shift /1 -if NOT "%1"=="" goto :loop -echo /* automatically generated by %0 %* -echo * do not edit -echo */ -echo #include "squid.h" -for /F %%m in (%temp%\auth_modules.txt) do echo extern AUTHSSETUP authSchemeSetup_%%m; -echo void authSchemeSetup(void) -echo { -for /F %%m in (%temp%\auth_modules.txt) do echo authSchemeAdd("%%m", authSchemeSetup_%%m); -echo } -if exist %temp%\auth_modules.txt del %temp%\auth_modules.txt +@echo off +if exist %temp%\auth_modules.txt del %temp%\auth_modules.txt +:loop +echo %1 >> %temp%\auth_modules.txt +shift /1 +if NOT "%1"=="" goto :loop +echo /* automatically generated by %0 %* +echo * do not edit +echo */ +echo #include "squid.h" +for /F %%m in (%temp%\auth_modules.txt) do echo extern AUTHSSETUP authSchemeSetup_%%m; +echo void authSchemeSetup(void) +echo { +for /F %%m in (%temp%\auth_modules.txt) do echo authSchemeAdd("%%m", authSchemeSetup_%%m); +echo } +if exist %temp%\auth_modules.txt del %temp%\auth_modules.txt Index: squid/port/win32/cf_data.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/cf_data.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/cf_data.dsp 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/cf_data.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,112 +1,112 @@ -# Microsoft Developer Studio Project File - Name="cf_data" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Generic Project" 0x010a - -CFG=cf_data - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cf_data.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cf_data.mak" CFG="cf_data - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cf_data - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "cf_data - Win32 Debug" (based on "Win32 (x86) Generic Project") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -MTL=midl.exe - -!IF "$(CFG)" == "cf_data - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "." -# PROP Intermediate_Dir "." -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "cf_data - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "cf_data___Win32_Debug" -# PROP BASE Intermediate_Dir "cf_data___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "." -# PROP Intermediate_Dir "." -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "cf_data - Win32 Release" -# Name "cf_data - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\cf.data.pre - -!IF "$(CFG)" == "cf_data - Win32 Release" - -# PROP Ignore_Default_Tool 1 -USERDEP__CF_DA="squid_mswin.mak" -# Begin Custom Build -InputDir=\WORK\CYGWIN-SVC-2_5\src -ProjDir=. -InputPath=..\..\src\cf.data.pre - -BuildCmds= \ - nmake /f $(ProjDir)\squid_mswin.mak cf.data \ - nmake /f $(ProjDir)\squid_mswin.mak cf_gen_defines.h \ - - -"$(InputDir)\cf.data" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputDir)\cf_gen_defines.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "cf_data - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -USERDEP__CF_DA="squid_mswin.mak" -# Begin Custom Build -InputDir=\WORK\CYGWIN-SVC-2_5\src -ProjDir=. -InputPath=..\..\src\cf.data.pre - -BuildCmds= \ - nmake /f $(ProjDir)\squid_mswin.mak cf.data \ - nmake /f $(ProjDir)\squid_mswin.mak cf_gen_defines.h \ - - -"$(InputDir)\cf.data" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(InputDir)\cf_gen_defines.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="cf_data" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Generic Project" 0x010a + +CFG=cf_data - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "cf_data.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "cf_data.mak" CFG="cf_data - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "cf_data - Win32 Release" (based on "Win32 (x86) Generic Project") +!MESSAGE "cf_data - Win32 Debug" (based on "Win32 (x86) Generic Project") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +MTL=midl.exe + +!IF "$(CFG)" == "cf_data - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "." +# PROP Intermediate_Dir "." +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "cf_data - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "cf_data___Win32_Debug" +# PROP BASE Intermediate_Dir "cf_data___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "." +# PROP Intermediate_Dir "." +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "cf_data - Win32 Release" +# Name "cf_data - Win32 Debug" +# Begin Source File + +SOURCE=..\..\src\cf.data.pre + +!IF "$(CFG)" == "cf_data - Win32 Release" + +# PROP Ignore_Default_Tool 1 +USERDEP__CF_DA="squid_mswin.mak" +# Begin Custom Build +InputDir=\WORK\CYGWIN-SVC-2_5\src +ProjDir=. +InputPath=..\..\src\cf.data.pre + +BuildCmds= \ + nmake /f $(ProjDir)\squid_mswin.mak cf.data \ + nmake /f $(ProjDir)\squid_mswin.mak cf_gen_defines.h \ + + +"$(InputDir)\cf.data" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\cf_gen_defines.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "cf_data - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +USERDEP__CF_DA="squid_mswin.mak" +# Begin Custom Build +InputDir=\WORK\CYGWIN-SVC-2_5\src +ProjDir=. +InputPath=..\..\src\cf.data.pre + +BuildCmds= \ + nmake /f $(ProjDir)\squid_mswin.mak cf.data \ + nmake /f $(ProjDir)\squid_mswin.mak cf_gen_defines.h \ + + +"$(InputDir)\cf.data" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(InputDir)\cf_gen_defines.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/default_config_file.cmd Wed Feb 14 00:57:31 2007 @@ -0,0 +1,6 @@ +@echo off +echo /* automatically generated by %0 %* +echo * do not edit +echo */ +echo #define DEFAULT_CONFIG_FILE "%1" +echo #define DEFAULT_SQUID_ERROR_DIR "%2" Index: squid/port/win32/modules.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/modules.dsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/port/win32/modules.dsp 18 Mar 2002 22:33:47 -0000 1.1.2.2 +++ squid/port/win32/modules.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.3 @@ -1,174 +1,205 @@ -# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Generic Project" 0x010a - -CFG=modules - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "modules.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "modules.mak" CFG="modules - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Generic Project") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -MTL=midl.exe - -!IF "$(CFG)" == "modules - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\src" -# PROP Intermediate_Dir "." -# PROP Target_Dir "" - -!ELSEIF "$(CFG)" == "modules - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "modules___Win32_Debug" -# PROP BASE Intermediate_Dir "modules___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\src" -# PROP Intermediate_Dir "." -# PROP Target_Dir "" - -!ENDIF - -# Begin Target - -# Name "modules - Win32 Release" -# Name "modules - Win32 Debug" -# Begin Source File - -SOURCE=.\auth_modules.cmd - -!IF "$(CFG)" == "modules - Win32 Release" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__AUTH_="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\auth_modules.cmd - -"$(OutDir)\auth_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak auth_modules.c - -# End Custom Build - -!ELSEIF "$(CFG)" == "modules - Win32 Debug" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__AUTH_="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\auth_modules.cmd - -"$(OutDir)\auth_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak auth_modules.c - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\repl_modules.cmd - -!IF "$(CFG)" == "modules - Win32 Release" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__REPL_="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\repl_modules.cmd - -"$(OutDir)\repl_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak repl_modules.c - -# End Custom Build - -!ELSEIF "$(CFG)" == "modules - Win32 Debug" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__REPL_="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\repl_modules.cmd - -"$(OutDir)\repl_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak repl_modules.c - -# End Custom Build - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\store_modules.cmd - -!IF "$(CFG)" == "modules - Win32 Release" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__STORE="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\store_modules.cmd - -"$(OutDir)\store_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak store_modules.c - -# End Custom Build - -!ELSEIF "$(CFG)" == "modules - Win32 Debug" - -# PROP Intermediate_Dir "." -# PROP Ignore_Default_Tool 1 -USERDEP__STORE="squid_mswin.mak" -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=.\store_modules.cmd - -"$(OutDir)\store_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nmake /f $(ProjDir)\squid_mswin.mak store_modules.c - -# End Custom Build - -!ENDIF - -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Generic Project" 0x010a + +CFG=modules - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "modules.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "modules.mak" CFG="modules - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Generic Project") +!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Generic Project") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +MTL=midl.exe + +!IF "$(CFG)" == "modules - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src" +# PROP Intermediate_Dir "." +# PROP Target_Dir "" + +!ELSEIF "$(CFG)" == "modules - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "modules___Win32_Debug" +# PROP BASE Intermediate_Dir "modules___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src" +# PROP Intermediate_Dir "." +# PROP Target_Dir "" + +!ENDIF + +# Begin Target + +# Name "modules - Win32 Release" +# Name "modules - Win32 Debug" +# Begin Source File + +SOURCE=.\auth_modules.cmd + +!IF "$(CFG)" == "modules - Win32 Release" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +USERDEP__AUTH_="squid_mswin.mak" +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=.\auth_modules.cmd + +"$(OutDir)\auth_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak auth_modules.c + +# End Custom Build + +!ELSEIF "$(CFG)" == "modules - Win32 Debug" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +USERDEP__AUTH_="squid_mswin.mak" +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=.\auth_modules.cmd + +"$(OutDir)\auth_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak auth_modules.c + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\default_config_file.cmd + +!IF "$(CFG)" == "modules - Win32 Release" + +USERDEP__DEFAU="squid_mswin.mak" +# Begin Custom Build +ProjDir=. +InputPath=.\default_config_file.cmd + +"$(ProjDir)\include\default_config_file.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak default_config_file.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "modules - Win32 Debug" + +USERDEP__DEFAU="squid_mswin.mak" +# Begin Custom Build +ProjDir=. +InputPath=.\default_config_file.cmd + +"$(ProjDir)\include\default_config_file.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak default_config_file.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\repl_modules.cmd + +!IF "$(CFG)" == "modules - Win32 Release" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +USERDEP__REPL_="squid_mswin.mak" +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=.\repl_modules.cmd + +"$(OutDir)\repl_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak repl_modules.c + +# End Custom Build + +!ELSEIF "$(CFG)" == "modules - Win32 Debug" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +USERDEP__REPL_="squid_mswin.mak" +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=.\repl_modules.cmd + +"$(OutDir)\repl_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak repl_modules.c + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\store_modules.cmd + +!IF "$(CFG)" == "modules - Win32 Release" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +USERDEP__STORE="squid_mswin.mak" +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=.\store_modules.cmd + +"$(OutDir)\store_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak store_modules.c + +# End Custom Build + +!ELSEIF "$(CFG)" == "modules - Win32 Debug" + +# PROP Intermediate_Dir "." +# PROP Ignore_Default_Tool 1 +USERDEP__STORE="squid_mswin.mak" +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=.\store_modules.cmd + +"$(OutDir)\store_modules.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + nmake /f $(ProjDir)\squid_mswin.mak store_modules.c + +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project Index: squid/port/win32/repl_modules.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/repl_modules.cmd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/repl_modules.cmd 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/repl_modules.cmd 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,16 +1,16 @@ -@echo off -if exist %temp%\repl_modules.txt del %temp%\repl_modules.txt -:loop -echo %1 >> %temp%\repl_modules.txt -shift /1 -if NOT "%1"=="" goto :loop -echo /* automatically generated by %0 %* -echo * do not edit -echo */ -echo #include "squid.h" -for /F %%m in (%temp%\repl_modules.txt) do echo extern REMOVALPOLICYCREATE createRemovalPolicy_%%m; -echo void storeReplSetup(void) -echo { -for /F %%m in (%temp%\repl_modules.txt) do echo storeReplAdd("%%m", createRemovalPolicy_%%m); -echo } -if exist %temp%\repl_modules.txt del %temp%\repl_modules.txt +@echo off +if exist %temp%\repl_modules.txt del %temp%\repl_modules.txt +:loop +echo %1 >> %temp%\repl_modules.txt +shift /1 +if NOT "%1"=="" goto :loop +echo /* automatically generated by %0 %* +echo * do not edit +echo */ +echo #include "squid.h" +for /F %%m in (%temp%\repl_modules.txt) do echo extern REMOVALPOLICYCREATE createRemovalPolicy_%%m; +echo void storeReplSetup(void) +echo { +for /F %%m in (%temp%\repl_modules.txt) do echo storeReplAdd("%%m", createRemovalPolicy_%%m); +echo } +if exist %temp%\repl_modules.txt del %temp%\repl_modules.txt Index: squid/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid.dsw,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid/port/win32/squid.dsw 23 Mar 2002 17:59:03 -0000 1.1.2.4 +++ squid/port/win32/squid.dsw 27 Mar 2002 21:01:10 -0000 1.1.2.5 @@ -1,356 +1,377 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "LDAP_auth"=".\LDAP_auth\LDAP_auth.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "PerlPreprocessing"=".\PerlPreprocessing.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "cachemgr"=".\cachemgr\cachemgr.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libmiscutil - End Project Dependency -}}} - -############################################################################### - -Project: "cf_data"=".\cf_data.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "cf_gen"=".\cf_gen\cf_gen.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libmiscutil - End Project Dependency -}}} - -############################################################################### - -Project: "fake_auth"=".\fake_auth\fake_auth.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libmiscutil - End Project Dependency -}}} - -############################################################################### - -Project: "libawin32"=".\libawin32\libawin32.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libbasic"=".\libbasic\libbasic.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libgnuregex"=".\libgnuregex\libgnuregex.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libheap"=".\libheap\libheap.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "liblru"=".\liblru\liblru.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libmiscutil"=".\libmiscutil\libmiscutil.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libntlm"=".\libntlm\libntlm.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libntlmauth"=".\libntlmauth\libntlmauth.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libsnmp"=".\libsnmp\libsnmp.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libufs"=".\libufs\libufs.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "modules"=".\modules.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "nt_auth"=".\nt_auth\nt_auth.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "squid"=".\squid\squid.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libgnuregex - End Project Dependency - Begin Project Dependency - Project_Dep_Name libmiscutil - End Project Dependency - Begin Project Dependency - Project_Dep_Name PerlPreprocessing - End Project Dependency - Begin Project Dependency - Project_Dep_Name libntlmauth - End Project Dependency - Begin Project Dependency - Project_Dep_Name libsnmp - End Project Dependency - Begin Project Dependency - Project_Dep_Name modules - End Project Dependency - Begin Project Dependency - Project_Dep_Name squid_conf_default - End Project Dependency - Begin Project Dependency - Project_Dep_Name cachemgr - End Project Dependency - Begin Project Dependency - Project_Dep_Name libbasic - End Project Dependency - Begin Project Dependency - Project_Dep_Name liblru - End Project Dependency - Begin Project Dependency - Project_Dep_Name libntlm - End Project Dependency - Begin Project Dependency - Project_Dep_Name libufs - End Project Dependency - Begin Project Dependency - Project_Dep_Name nt_auth - End Project Dependency - Begin Project Dependency - Project_Dep_Name unlinkd - End Project Dependency - Begin Project Dependency - Project_Dep_Name squidclient - End Project Dependency - Begin Project Dependency - Project_Dep_Name libawin32 - End Project Dependency - Begin Project Dependency - Project_Dep_Name LDAP_auth - End Project Dependency - Begin Project Dependency - Project_Dep_Name fake_auth - End Project Dependency - Begin Project Dependency - Project_Dep_Name libheap - End Project Dependency -}}} - -############################################################################### - -Project: "squid_conf_default"=".\squid_conf_default.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name cf_data - End Project Dependency - Begin Project Dependency - Project_Dep_Name cf_gen - End Project Dependency -}}} - -############################################################################### - -Project: "squidclient"=".\squidclient\squidclient.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libmiscutil - End Project Dependency -}}} - -############################################################################### - -Project: "unlinkd"=".\unlinkd\unlinkd.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "LDAP_auth"=".\LDAP_auth\LDAP_auth.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "PerlPreprocessing"=".\PerlPreprocessing.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "cachemgr"=".\cachemgr\cachemgr.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency +}}} + +############################################################################### + +Project: "cf_data"=".\cf_data.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "cf_gen"=".\cf_gen\cf_gen.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency + Begin Project Dependency + Project_Dep_Name cf_data + End Project Dependency +}}} + +############################################################################### + +Project: "fake_auth"=".\fake_auth\fake_auth.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency +}}} + +############################################################################### + +Project: "libawin32"=".\libawin32\libawin32.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libbasic"=".\libbasic\libbasic.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libgnuregex"=".\libgnuregex\libgnuregex.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libheap"=".\libheap\libheap.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "liblru"=".\liblru\liblru.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libmiscutil"=".\libmiscutil\libmiscutil.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libntlm"=".\libntlm\libntlm.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libntlmauth"=".\libntlmauth\libntlmauth.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libsnmp"=".\libsnmp\libsnmp.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libufs"=".\libufs\libufs.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "modules"=".\modules.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "nt_auth"=".\nt_auth\nt_auth.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "pinger"=".\pinger\pinger.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency + Begin Project Dependency + Project_Dep_Name PerlPreprocessing + End Project Dependency +}}} + +############################################################################### + +Project: "squid"=".\squid\squid.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libgnuregex + End Project Dependency + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency + Begin Project Dependency + Project_Dep_Name PerlPreprocessing + End Project Dependency + Begin Project Dependency + Project_Dep_Name libntlmauth + End Project Dependency + Begin Project Dependency + Project_Dep_Name libsnmp + End Project Dependency + Begin Project Dependency + Project_Dep_Name modules + End Project Dependency + Begin Project Dependency + Project_Dep_Name squid_conf_default + End Project Dependency + Begin Project Dependency + Project_Dep_Name cachemgr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libbasic + End Project Dependency + Begin Project Dependency + Project_Dep_Name liblru + End Project Dependency + Begin Project Dependency + Project_Dep_Name libntlm + End Project Dependency + Begin Project Dependency + Project_Dep_Name libufs + End Project Dependency + Begin Project Dependency + Project_Dep_Name nt_auth + End Project Dependency + Begin Project Dependency + Project_Dep_Name unlinkd + End Project Dependency + Begin Project Dependency + Project_Dep_Name squidclient + End Project Dependency + Begin Project Dependency + Project_Dep_Name libawin32 + End Project Dependency + Begin Project Dependency + Project_Dep_Name LDAP_auth + End Project Dependency + Begin Project Dependency + Project_Dep_Name fake_auth + End Project Dependency + Begin Project Dependency + Project_Dep_Name libheap + End Project Dependency + Begin Project Dependency + Project_Dep_Name pinger + End Project Dependency +}}} + +############################################################################### + +Project: "squid_conf_default"=".\squid_conf_default.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name cf_gen + End Project Dependency +}}} + +############################################################################### + +Project: "squidclient"=".\squidclient\squidclient.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency +}}} + +############################################################################### + +Project: "unlinkd"=".\unlinkd\unlinkd.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + Index: squid/port/win32/squid_conf_default.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid_conf_default.dsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/port/win32/squid_conf_default.dsp 18 Mar 2002 22:33:47 -0000 1.1.2.2 +++ squid/port/win32/squid_conf_default.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.3 @@ -1,114 +1,114 @@ -# Microsoft Developer Studio Project File - Name="squid_conf_default" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Generic Project" 0x010a - -CFG=squid_conf_default - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "squid_conf_default.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "squid_conf_default.mak" CFG="squid_conf_default - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "squid_conf_default - Win32 Release" (based on "Win32 (x86) Generic Project") -!MESSAGE "squid_conf_default - Win32 Debug" (based on "Win32 (x86) Generic Project") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -MTL=midl.exe - -!IF "$(CFG)" == "squid_conf_default - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\src" -# PROP Intermediate_Dir "." -# PROP Target_Dir "" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=del ..\..\src\squid.conf.default move squid.conf.default ..\..\src\squid.conf.default del ..\..\src\cf_parser.h move cf_parser.h ..\..\src\cf_parser.h -# End Special Build Tool - -!ELSEIF "$(CFG)" == "squid_conf_default - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "squid_conf_default___Win32_Debug" -# PROP BASE Intermediate_Dir "squid_conf_default___Win32_Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\src" -# PROP Intermediate_Dir "." -# PROP Target_Dir "" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=del ..\..\src\squid.conf.default move squid.conf.default ..\..\src\squid.conf.default del ..\..\src\cf_parser.h move cf_parser.h ..\..\src\cf_parser.h -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "squid_conf_default - Win32 Release" -# Name "squid_conf_default - Win32 Debug" -# Begin Source File - -SOURCE=..\..\src\cf.data - -!IF "$(CFG)" == "squid_conf_default - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=..\..\src\cf.data - -BuildCmds= \ - $(ProjDir)\cf_gen\Release\cf_gen $(InputPath) - -"$(OutDir)\squid.conf.default" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(OutDir)\cf_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "squid_conf_default - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build -OutDir=.\..\..\src -ProjDir=. -InputPath=..\..\src\cf.data - -BuildCmds= \ - $(ProjDir)\cf_gen\debug\cf_gen $(InputPath) - -"$(OutDir)\squid.conf.default" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) - -"$(OutDir)\cf_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="squid_conf_default" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Generic Project" 0x010a + +CFG=squid_conf_default - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "squid_conf_default.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "squid_conf_default.mak" CFG="squid_conf_default - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "squid_conf_default - Win32 Release" (based on "Win32 (x86) Generic Project") +!MESSAGE "squid_conf_default - Win32 Debug" (based on "Win32 (x86) Generic Project") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +MTL=midl.exe + +!IF "$(CFG)" == "squid_conf_default - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "..\..\src" +# PROP Intermediate_Dir "." +# PROP Target_Dir "" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=del ..\..\src\squid.conf.default move squid.conf.default ..\..\src\squid.conf.default del ..\..\src\cf_parser.h move cf_parser.h ..\..\src\cf_parser.h +# End Special Build Tool + +!ELSEIF "$(CFG)" == "squid_conf_default - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "squid_conf_default___Win32_Debug" +# PROP BASE Intermediate_Dir "squid_conf_default___Win32_Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "..\..\src" +# PROP Intermediate_Dir "." +# PROP Target_Dir "" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=del ..\..\src\squid.conf.default move squid.conf.default ..\..\src\squid.conf.default del ..\..\src\cf_parser.h move cf_parser.h ..\..\src\cf_parser.h +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "squid_conf_default - Win32 Release" +# Name "squid_conf_default - Win32 Debug" +# Begin Source File + +SOURCE=..\..\src\cf.data + +!IF "$(CFG)" == "squid_conf_default - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=..\..\src\cf.data + +BuildCmds= \ + $(ProjDir)\cf_gen\Release\cf_gen $(InputPath) + +"$(OutDir)\squid.conf.default" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(OutDir)\cf_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ELSEIF "$(CFG)" == "squid_conf_default - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build +OutDir=.\..\..\src +ProjDir=. +InputPath=..\..\src\cf.data + +BuildCmds= \ + $(ProjDir)\cf_gen\debug\cf_gen $(InputPath) + +"$(OutDir)\squid.conf.default" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +"$(OutDir)\cf_parser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project Index: squid/port/win32/squid_mswin.mak =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/squid_mswin.mak,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/port/win32/squid_mswin.mak 23 Mar 2002 17:59:03 -0000 1.1.2.3 +++ squid/port/win32/squid_mswin.mak 27 Mar 2002 21:01:10 -0000 1.1.2.4 @@ -1,75 +1,81 @@ -THISMAKEFILE = squid_mswin.mak - -prefix = c:/squid -exec_prefix = $(prefix) -exec_suffix = .exe -cgi_suffix = .cgi -top_srcdir = .. -bindir = $(exec_prefix) -libexecdir = $(bindir)/libexec -sysconfdir = $(prefix)/etc -localstatedir = $(prefix)/var -srcdir = ..\..\src - -# Gotta love the DOS legacy -# -SQUID_EXE = squid$(exec_suffix) -CLIENT_EXE = client$(exec_suffix) -DNSSERVER_EXE = dnsserver$(exec_suffix) -UNLINKD_EXE = unlinkd$(exec_suffix) -PINGER_EXE = pinger$(exec_suffix) -CACHEMGR_EXE = cachemgr$(cgi_suffix) -DISKD_EXE = diskd$(exec_suffix) - -DEFAULT_PREFIX = $(prefix) -DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf -DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf -DEFAULT_DNSSERVER = $(libexecdir)/$(DNSSERVER_EXE) -DEFAULT_LOG_PREFIX = $(localstatedir)/logs -DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log -DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log -DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log -DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -DEFAULT_SWAP_DIR = $(localstatedir)/cache -DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE) -DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE) -DEFAULT_DISKD = $(libexecdir)/$(DISKD_EXE) -DEFAULT_ICON_DIR = $(sysconfdir)/icons -DEFAULT_ERROR_DIR = $(sysconfdir)/errors -DEFAULT_MIB_PATH = $(sysconfdir)/mib.txt - -AUTH_MODULES = basic ntlm -REPL_POLICIES = lru heap -STORE_MODULES = ufs awin32 - -cf_gen_defines.h: $(srcdir)\cf_gen_defines $(srcdir)\cf.data.pre - gawk -f $(srcdir)\cf_gen_defines <$(srcdir)\cf.data.pre >$(srcdir)\cf_gen_defines.h - -cf.data: $(srcdir)\cf.data.pre .\$(THISMAKEFILE) - sed "\ - s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ - s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\ - s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\ - s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\ - s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\ - s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\ - s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\ - s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\ - s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\ - s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\ - s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\ - s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\ - s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ - s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;"\ - < $(srcdir)\cf.data.pre >$(srcdir)\cf.data - -auth_modules.c: .\auth_modules.cmd .\$(THISMAKEFILE) - .\auth_modules.cmd $(AUTH_MODULES) >$(srcdir)\auth_modules.c - -repl_modules.c: .\repl_modules.cmd .\$(THISMAKEFILE) - .\repl_modules.cmd $(REPL_POLICIES) >$(srcdir)\repl_modules.c - -store_modules.c: .\store_modules.cmd .\$(THISMAKEFILE) - .\store_modules.cmd $(STORE_MODULES) >$(srcdir)\store_modules.c - +THISMAKEFILE = squid_mswin.mak + +prefix = c:/squid +exec_prefix = $(prefix)/bin +exec_suffix = .exe +cgi_suffix = .cgi +top_srcdir = ..\..\ +bindir = $(exec_prefix) +libexecdir = $(prefix)/libexec +sysconfdir = $(prefix)/etc +datadir = $(prefix)/share +localstatedir = $(prefix)/var +srcdir = ..\..\src +win32includedir = .\include + +# Gotta love the DOS legacy +# +SQUID_EXE = squid$(exec_suffix) +CLIENT_EXE = client$(exec_suffix) +DNSSERVER_EXE = dnsserver$(exec_suffix) +UNLINKD_EXE = unlinkd$(exec_suffix) +PINGER_EXE = pinger$(exec_suffix) +CACHEMGR_EXE = cachemgr$(cgi_suffix) +DISKD_EXE = diskd$(exec_suffix) + +DEFAULT_PREFIX = $(prefix) +DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf +DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf +DEFAULT_DNSSERVER = $(libexecdir)/$(DNSSERVER_EXE) +DEFAULT_LOG_PREFIX = $(localstatedir)/logs +DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log +DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log +DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log +DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid +DEFAULT_SWAP_DIR = $(localstatedir)/cache +DEFAULT_PINGER = $(libexecdir)/$(PINGER_EXE) +DEFAULT_UNLINKD = $(libexecdir)/$(UNLINKD_EXE) +DEFAULT_DISKD = $(libexecdir)/$(DISKD_EXE) +DEFAULT_ICON_DIR = $(datadir)/icons +DEFAULT_ERROR_DIR = $(datadir)/errors/English +DEFAULT_MIB_PATH = $(datadir)/mib.txt +DEFAULT_HOSTS = none + +AUTH_MODULES = basic ntlm +REPL_POLICIES = lru heap +STORE_MODULES = ufs awin32 + +cf_gen_defines.h: $(srcdir)\cf_gen_defines $(srcdir)\cf.data.pre + gawk -f $(srcdir)\cf_gen_defines <$(srcdir)\cf.data.pre >$(srcdir)\cf_gen_defines.h + +cf.data: $(srcdir)\cf.data.pre .\$(THISMAKEFILE) + sed "\ + s%@DEFAULT_MIME_TABLE@%$(DEFAULT_MIME_TABLE)%g;\ + s%@DEFAULT_DNSSERVER@%$(DEFAULT_DNSSERVER)%g;\ + s%@DEFAULT_UNLINKD@%$(DEFAULT_UNLINKD)%g;\ + s%@DEFAULT_PINGER@%$(DEFAULT_PINGER)%g;\ + s%@DEFAULT_DISKD@%$(DEFAULT_DISKD)%g;\ + s%@DEFAULT_CACHE_LOG@%$(DEFAULT_CACHE_LOG)%g;\ + s%@DEFAULT_ACCESS_LOG@%$(DEFAULT_ACCESS_LOG)%g;\ + s%@DEFAULT_STORE_LOG@%$(DEFAULT_STORE_LOG)%g;\ + s%@DEFAULT_PID_FILE@%$(DEFAULT_PID_FILE)%g;\ + s%@DEFAULT_SWAP_DIR@%$(DEFAULT_SWAP_DIR)%g;\ + s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\ + s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\ + s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\ + s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\ + s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;"\ + < $(srcdir)\cf.data.pre >$(srcdir)\cf.data + +auth_modules.c: .\auth_modules.cmd .\$(THISMAKEFILE) + .\auth_modules.cmd $(AUTH_MODULES) >$(srcdir)\auth_modules.c + +repl_modules.c: .\repl_modules.cmd .\$(THISMAKEFILE) + .\repl_modules.cmd $(REPL_POLICIES) >$(srcdir)\repl_modules.c + +store_modules.c: .\store_modules.cmd .\$(THISMAKEFILE) + .\store_modules.cmd $(STORE_MODULES) >$(srcdir)\store_modules.c + +default_config_file.h: .\$(THISMAKEFILE) + .\default_config_file.cmd $(DEFAULT_CONFIG_FILE) $(DEFAULT_ERROR_DIR) >$(win32includedir)\default_config_file.h \ No newline at end of file Index: squid/port/win32/store_modules.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/store_modules.cmd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/store_modules.cmd 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/store_modules.cmd 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,16 +1,16 @@ -@echo off -if exist %temp%\store_modules.txt del %temp%\store_modules.txt -:loop -echo %1 >> %temp%\store_modules.txt -shift /1 -if NOT "%1"=="" goto :loop -echo /* automatically generated by %0 %* -echo * do not edit -echo */ -echo #include "squid.h" -for /F %%m in (%temp%\store_modules.txt) do echo extern STSETUP storeFsSetup_%%m; -echo void storeFsSetup(void) -echo { -for /F %%m in (%temp%\store_modules.txt) do echo storeFsAdd("%%m", storeFsSetup_%%m); -echo } -if exist %temp%\store_modules.txt del %temp%\store_modules.txt +@echo off +if exist %temp%\store_modules.txt del %temp%\store_modules.txt +:loop +echo %1 >> %temp%\store_modules.txt +shift /1 +if NOT "%1"=="" goto :loop +echo /* automatically generated by %0 %* +echo * do not edit +echo */ +echo #include "squid.h" +for /F %%m in (%temp%\store_modules.txt) do echo extern STSETUP storeFsSetup_%%m; +echo void storeFsSetup(void) +echo { +for /F %%m in (%temp%\store_modules.txt) do echo storeFsAdd("%%m", storeFsSetup_%%m); +echo } +if exist %temp%\store_modules.txt del %temp%\store_modules.txt Index: squid/port/win32/update.cmd =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/Attic/update.cmd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/update.cmd 23 Mar 2002 10:35:24 -0000 1.1.2.1 +++ squid/port/win32/update.cmd 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,14 +1,15 @@ -@echo off -if %1==release net stop "SquidNT" -copy %0\..\squid\%1\squid.exe %2\bin\squid.exe -copy %0\..\unlinkd\%1\unlinkd.exe %2\libexec\unlinkd.exe -rem copy %0\..\dnsserver\%1\dnsserver.exe %2\libexec\dnsserver.exe -copy %0\..\squidclient\%1\squidclient.exe %2\squidclient.exe -copy %0\..\fake_auth\%1\fake_auth.exe %2\libexec\fake_auth.exe -copy %0\..\nt_auth\%1\nt_auth.exe %2\libexec\nt_auth.exe -rem copy %0\..\ncsa_auth\%1\ncsa_auth.exe %2\libexec\ncsa_auth.exe -copy %0\..\ldap_auth\%1\ldap_auth.exe %2\libexec\ldap_auth.exe -rem copy %0\..\..\contrib\htpasswd\%1\htpasswd.exe %2\htpasswd.exe -copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.exe -rem copy %0\..\..\contrib\chpasswd\%1\chpasswd.exe %2\cgi-bin\chpasswd.cgi -if %1==release net start "SquidNT" +@echo off +if %1==release net stop "SquidNT" +copy %0\..\squid\%1\squid.exe %2\bin\squid.exe +copy %0\..\unlinkd\%1\unlinkd.exe %2\libexec\unlinkd.exe +rem copy %0\..\dnsserver\%1\dnsserver.exe %2\libexec\dnsserver.exe +copy %0\..\pinger\%1\pinger.exe %2\libexec\pinger.exe +copy %0\..\squidclient\%1\squidclient.exe %2\bin\squidclient.exe +copy %0\..\fake_auth\%1\fake_auth.exe %2\libexec\fake_auth.exe +copy %0\..\nt_auth\%1\nt_auth.exe %2\libexec\nt_auth.exe +rem copy %0\..\ncsa_auth\%1\ncsa_auth.exe %2\libexec\ncsa_auth.exe +copy %0\..\ldap_auth\%1\ldap_auth.exe %2\libexec\ldap_auth.exe +rem copy %0\..\..\contrib\htpasswd\%1\htpasswd.exe %2\htpasswd.exe +copy %0\..\cachemgr\%1\cachemgr.exe %2\libexec\cachemgr.exe +rem copy %0\..\..\contrib\chpasswd\%1\chpasswd.exe %2\cgi-bin\chpasswd.cgi +if %1==release net start "SquidNT" Index: squid/port/win32/LDAP_auth/LDAP_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/LDAP_auth/Attic/LDAP_auth.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/LDAP_auth/LDAP_auth.dsp 23 Mar 2002 10:35:25 -0000 1.1.2.1 +++ squid/port/win32/LDAP_auth/LDAP_auth.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,109 +1,109 @@ -# Microsoft Developer Studio Project File - Name="LDAP_auth" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=LDAP_auth - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "LDAP_auth.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "LDAP_auth.mak" CFG="LDAP_auth - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "LDAP_auth - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "LDAP_auth - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "LDAP_auth - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 Wldap32.lib /nologo /subsystem:console /machine:I386 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "LDAP_auth - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Wldap32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "LDAP_auth - Win32 Release" -# Name "LDAP_auth - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\auth\basic\helpers\LDAP\squid_ldap_auth.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="LDAP_auth" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=LDAP_auth - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "LDAP_auth.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "LDAP_auth.mak" CFG="LDAP_auth - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "LDAP_auth - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "LDAP_auth - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "LDAP_auth - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 Wldap32.lib /nologo /subsystem:console /machine:I386 +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "LDAP_auth - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 Wldap32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "LDAP_auth - Win32 Release" +# Name "LDAP_auth - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\helpers\LDAP\squid_ldap_auth.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/cachemgr/cachemgr.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/cachemgr/Attic/cachemgr.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/cachemgr/cachemgr.dsp 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/cachemgr/cachemgr.dsp 27 Mar 2002 21:01:10 -0000 1.1.2.2 @@ -1,110 +1,110 @@ -# Microsoft Developer Studio Project File - Name="cachemgr" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=cachemgr - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cachemgr.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cachemgr.mak" CFG="cachemgr - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cachemgr - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "cachemgr - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cachemgr - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../src" /I "../../../include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "cachemgr - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "cachemgr - Win32 Release" -# Name "cachemgr - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\cachemgr.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\include\snprintf.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\util.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="cachemgr" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=cachemgr - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "cachemgr.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "cachemgr.mak" CFG="cachemgr - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "cachemgr - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "cachemgr - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "cachemgr - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../src" /I "../../../include" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "cachemgr - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "cachemgr - Win32 Release" +# Name "cachemgr - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\cachemgr.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\include\snprintf.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\util.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/cf_gen/cf_gen.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/cf_gen/Attic/cf_gen.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/cf_gen/cf_gen.dsp 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/cf_gen/cf_gen.dsp 27 Mar 2002 21:01:11 -0000 1.1.2.2 @@ -1,110 +1,110 @@ -# Microsoft Developer Studio Project File - Name="cf_gen" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=cf_gen - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cf_gen.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cf_gen.mak" CFG="cf_gen - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cf_gen - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "cf_gen - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cf_gen - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../include" /I "../" /I "../../src../include" /I "../../../include" /I "../../" /I "../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "cf_gen - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../" /I "../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "cf_gen - Win32 Release" -# Name "cf_gen - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\cf_gen.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\cf_gen_defines.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\config.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="cf_gen" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=cf_gen - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "cf_gen.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "cf_gen.mak" CFG="cf_gen - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "cf_gen - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "cf_gen - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "cf_gen - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../include" /I "../" /I "../../src../include" /I "../../../include" /I "../../" /I "../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "cf_gen - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../" /I "../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "cf_gen - Win32 Release" +# Name "cf_gen - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\cf_gen.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\cf_gen_defines.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\config.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/fake_auth/fake_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/fake_auth/Attic/fake_auth.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/fake_auth/fake_auth.dsp 23 Mar 2002 10:35:25 -0000 1.1.2.1 +++ squid/port/win32/fake_auth/fake_auth.dsp 27 Mar 2002 21:01:11 -0000 1.1.2.2 @@ -1,104 +1,104 @@ -# Microsoft Developer Studio Project File - Name="fake_auth" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=fake_auth - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fake_auth.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fake_auth.mak" CFG="fake_auth - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fake_auth - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "fake_auth - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fake_auth - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "fake_auth - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "fake_auth - Win32 Release" -# Name "fake_auth - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\auth\ntlm\helpers\fakeauth\fakeauth_auth.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\auth\ntlm\helpers\fakeauth\ntlm.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="fake_auth" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=fake_auth - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "fake_auth.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "fake_auth.mak" CFG="fake_auth - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "fake_auth - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "fake_auth - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "fake_auth - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "fake_auth - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "fake_auth - Win32 Release" +# Name "fake_auth - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\auth\ntlm\helpers\fakeauth\fakeauth_auth.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\auth\ntlm\helpers\fakeauth\ntlm.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/autoconf.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid/port/win32/include/autoconf.h 18 Mar 2002 22:33:48 -0000 1.1.2.2 +++ squid/port/win32/include/autoconf.h 27 Mar 2002 21:01:11 -0000 1.1.2.3 @@ -22,7 +22,7 @@ * */ -/* $Id: autoconf.h,v 1.1.2.2 2002/03/18 22:33:48 serassio Exp $ */ +/* $Id: autoconf.h,v 1.1.2.3 2002/03/27 21:01:11 serassio Exp $ */ /* * configure command line used to configure Squid @@ -70,7 +70,7 @@ /* Defines how many threads aufs uses for I/O */ #undef AUFS_IO_THREADS -#define AUFS_IO_THREADS 16 +#define AUFS_IO_THREADS 16 /* * If you want to use Squid's ICMP features (highly recommended!) then @@ -83,7 +83,7 @@ * ICP_OP_MISS_NOFETCH for sites which it cannot ping. */ #undef USE_ICMP - +#define USE_ICMP 1 /* * Traffic management via "delay pools". */ @@ -95,7 +95,7 @@ * directory. */ #undef USE_USERAGENT_LOG -#define USE_USERAGENT_LOG 1 +// #define USE_USERAGENT_LOG 1 /* * If you want to log Referer request header values, define this. @@ -119,7 +119,6 @@ * Define to enable WCCP */ #undef USE_WCCP -#define USE_WCCP 0 /* * Squid frequently calls gettimeofday() for accurate timestamping. @@ -141,7 +140,7 @@ * Define this to include code for the Hypertext Cache Protocol (HTCP) */ #undef USE_HTCP -#define USE_HTCP 1 +// #define USE_HTCP 1 /* * Use Cache Digests for locating objects in neighbor caches. This @@ -159,7 +158,7 @@ /* * Define Windows NT & Windows 2000 run service mode - */ + */ #undef USE_WIN32_SERVICE #define USE_WIN32_SERVICE 1 @@ -232,7 +231,7 @@ #undef HAVE_SETRESUID /* Define if you have struct rusage */ -#undef HAVE_STRUCT_RUSAGE +#undef HAVE_STRUCT_RUSAGE #define HAVE_STRUCT_RUSAGE 1 /* Define if you have PSAPI.DLL on Windows systems */ @@ -349,7 +348,7 @@ * (strongly recommended for ufs storage type) */ #undef USE_UNLINKD -#define USE_UNLINKD 1 +#define USE_UNLINKD 1 /* * Enable support for Transparent Proxy on Linux 2.4 systems @@ -378,7 +377,7 @@ typedef unsigned int u_int32_t; #undef int64_t -typedef __int64 int64_t; +typedef __int64 int64_t; #undef u_int64_t typedef unsigned __int64 u_int64_t; @@ -410,7 +409,7 @@ #undef HAVE_ARPA_NAMESER_H /* Define if you have the header file. */ -#undef HAVE_ASSERT_H +#undef HAVE_ASSERT_H #define HAVE_ASSERT_H 1 /* Define if you have the `backtrace_symbols_fd' function. */ @@ -542,7 +541,7 @@ #undef HAVE_LIBSOCKET /* Define if you have the header file. */ -#undef HAVE_LIMITS_H +#undef HAVE_LIMITS_H #define HAVE_LIMITS_H 1 /* Define if you have the header file. */ @@ -581,14 +580,14 @@ #define HAVE_MEMORY_H 1 /* Define if you have the `memset' function. */ -#undef HAVE_MEMSET +#undef HAVE_MEMSET #define HAVE_MEMSET 1 /* Define if you have the `mkstemp' function. */ #undef HAVE_MKSTEMP /* Define if you have the `mktime' function. */ -#undef HAVE_MKTIME +#undef HAVE_MKTIME #define HAVE_MKTIME 1 /* Define if you have the header file. */ @@ -661,7 +660,7 @@ #undef HAVE_PTHREAD_SIGMASK /* Define if you have the `putenv' function. */ -#undef HAVE_PUTENV +#undef HAVE_PUTENV #define HAVE_PUTENV 1 /* Define if you have the header file. */ @@ -671,11 +670,11 @@ #undef HAVE_RANDOM /* Define if you have the `regcomp' function. */ -#undef HAVE_REGCOMP +#undef HAVE_REGCOMP #define HAVE_REGCOMP 1 /* Define if you have the `regexec' function. */ -#undef HAVE_REGEXEC +#undef HAVE_REGEXEC #define HAVE_REGEXEC 1 /* Define if you have the header file. */ @@ -719,7 +718,7 @@ #define HAVE_SIGNAL_H 1 /* Define if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF +#undef HAVE_SNPRINTF #define HAVE_SNPRINTF 1 /* Define if you have the `srand48' function. */ @@ -801,7 +800,7 @@ #undef HAVE_SYS_STATVFS_H /* Define if you have the header file. */ -#undef HAVE_SYS_STAT_H +#undef HAVE_SYS_STAT_H #define HAVE_SYS_STAT_H 1 /* Define if you have the header file. */ @@ -908,7 +907,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "2.5.PRE4-CVS" +#define VERSION "2.5.PRE5-CVS" /* Define if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ Index: squid/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/squid-mswin.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/port/win32/include/squid-mswin.h 18 Mar 2002 22:33:48 -0000 1.1.2.3 +++ squid/port/win32/include/squid-mswin.h 27 Mar 2002 21:01:11 -0000 1.1.2.4 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.1.2.3 2002/03/18 22:33:48 serassio Exp $ + * $Id: squid-mswin.h,v 1.1.2.4 2002/03/27 21:01:11 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -31,6 +31,8 @@ * */ +#include "default_config_file.h" + /* Some tricks for MS Compilers */ #define __STDC__ 1 @@ -54,7 +56,7 @@ #define is_interface_down WIN32_is_interface_down #define lseek _lseeki64 #define memccpy _memccpy -#define mkdir(p,m) _mkdir(p) +#define mkdir(p,m) _mkdir(p) #define mktemp _mktemp #define open _open #define putenv _putenv @@ -241,9 +243,9 @@ #define shutdown(s,h) \ (SOCKET_ERROR == shutdown(_get_osfhandle(s),h) ? \ (errno = WSAGetLastError()), -1 : 0) -#define closesocket(s) \ - (SOCKET_ERROR == closesocket(_get_osfhandle(s)) ? \ - (errno = WSAGetLastError()), -1 : 0) +#define closesocket(s) \ + (SOCKET_ERROR == closesocket(_get_osfhandle(s)) ? \ + (errno = WSAGetLastError()), -1 : 0) #if defined(COMM_SELECT_C) #define select(n,r,w,e,t) \ (SOCKET_ERROR == (ws32_result = select(n,r,w,&errfds,t)) ? \ @@ -289,6 +291,28 @@ #define gethostbyaddr(a,l,t) \ (NULL == ((HOSTENT FAR*)ws32_result = gethostbyaddr(a,l,t)) ? \ (errno = WSAGetLastError()), NULL : (HOSTENT FAR*)ws32_result) +#undef WSASocket +#ifdef UNICODE +#define WSASocket(a,t,p,i,g,f) \ + (INVALID_SOCKET == ((SOCKET)ws32_result = WSASocketW(a,t,p,i,g,f)) ? \ + ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ + (SOCKET)_open_osfhandle(ws32_result,0)) +#else +#define WSASocket(a,t,p,i,g,f) \ + (INVALID_SOCKET == ((SOCKET)ws32_result = WSASocketA(a,t,p,i,g,f)) ? \ + ((WSAEMFILE == (errno = WSAGetLastError()) ? errno = EMFILE : -1), -1) : \ + (SOCKET)_open_osfhandle(ws32_result,0)) +#endif /* !UNICODE */ +#undef WSADuplicateSocket +#ifdef UNICODE +#define WSADuplicateSocket(s,n,l) \ + (SOCKET_ERROR == WSADuplicateSocketW(_get_osfhandle(s),n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#else +#define WSADuplicateSocket(s,n,l) \ + (SOCKET_ERROR == WSADuplicateSocketA(_get_osfhandle(s),n,l) ? \ + (errno = WSAGetLastError()), -1 : 0) +#endif /* !UNICODE */ #if defined(UTIL_C) || defined (STORE_DIR_C) || defined (STORE_IO_C) #define read _read @@ -306,11 +330,11 @@ == 0 ? send((fd),(buf),(siz),0) : _write((fd),(buf),(siz))) #endif -#if defined(COMM_C) || defined(TOOLS_C) -#define close closesocket -#else -#define close _close -#endif +#if defined(COMM_C) || defined(TOOLS_C) +#define close closesocket +#else +#define close _close +#endif #define RUSAGE_SELF 0 /* calling process */ #define RUSAGE_CHILDREN -1 /* terminated child processes */ Index: squid/port/win32/libawin32/libawin32.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libawin32/Attic/libawin32.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libawin32/libawin32.dsp 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/libawin32/libawin32.dsp 27 Mar 2002 21:01:11 -0000 1.1.2.2 @@ -1,112 +1,112 @@ -# Microsoft Developer Studio Project File - Name="libawin32" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libawin32 - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libawin32.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libawin32.mak" CFG="libawin32 - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libawin32 - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libawin32 - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libawin32 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libawin32 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libawin32 - Win32 Release" -# Name "libawin32 - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\aiops.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\async_io.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\store_dir_aufs.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\store_io_aufs.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\fs\awin32\store_asyncufs.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libawin32" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libawin32 - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libawin32.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libawin32.mak" CFG="libawin32 - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libawin32 - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libawin32 - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libawin32 - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libawin32 - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libawin32 - Win32 Release" +# Name "libawin32 - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\fs\awin32\aiops.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\awin32\async_io.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\awin32\store_dir_aufs.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\awin32\store_io_aufs.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\fs\awin32\store_asyncufs.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/libbasic/libbasic.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libbasic/Attic/libbasic.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libbasic/libbasic.dsp 16 Mar 2002 17:54:33 -0000 1.1.2.1 +++ squid/port/win32/libbasic/libbasic.dsp 27 Mar 2002 21:01:12 -0000 1.1.2.2 @@ -1,100 +1,100 @@ -# Microsoft Developer Studio Project File - Name="libbasic" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libbasic - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libbasic.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libbasic.mak" CFG="libbasic - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libbasic - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libbasic - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libbasic - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libbasic - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libbasic - Win32 Release" -# Name "libbasic - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\auth\basic\auth_basic.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\auth\basic\auth_basic.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libbasic" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libbasic - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libbasic.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libbasic.mak" CFG="libbasic - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libbasic - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libbasic - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libbasic - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libbasic - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libbasic - Win32 Release" +# Name "libbasic - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\auth_basic.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\auth_basic.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/libgnuregex/libgnuregex.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libgnuregex/Attic/libgnuregex.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libgnuregex/libgnuregex.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/libgnuregex/libgnuregex.dsp 27 Mar 2002 21:01:12 -0000 1.1.2.2 @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="libgnuregex" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libgnuregex - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libgnuregex.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libgnuregex.mak" CFG="libgnuregex - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libgnuregex - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libgnuregex - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libgnuregex - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libgnuregex - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libgnuregex - Win32 Release" -# Name "libgnuregex - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\lib\GNUregex.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libgnuregex" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libgnuregex - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libgnuregex.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libgnuregex.mak" CFG="libgnuregex - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libgnuregex - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libgnuregex - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libgnuregex - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libgnuregex - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libgnuregex - Win32 Release" +# Name "libgnuregex - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\lib\GNUregex.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# End Target +# End Project Index: squid/port/win32/libheap/libheap.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libheap/Attic/libheap.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libheap/libheap.dsp 23 Mar 2002 17:59:03 -0000 1.1.2.1 +++ squid/port/win32/libheap/libheap.dsp 27 Mar 2002 21:01:12 -0000 1.1.2.2 @@ -1,104 +1,104 @@ -# Microsoft Developer Studio Project File - Name="libheap" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libheap - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libheap.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libheap.mak" CFG="libheap - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libheap - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libheap - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libheap - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libheap - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libheap - Win32 Release" -# Name "libheap - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\repl\heap\store_heap_replacement.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\repl\heap\store_repl_heap.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\repl\heap\store_heap_replacement.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libheap" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libheap - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libheap.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libheap.mak" CFG="libheap - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libheap - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libheap - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libheap - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libheap - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libheap - Win32 Release" +# Name "libheap - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\repl\heap\store_heap_replacement.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\repl\heap\store_repl_heap.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\repl\heap\store_heap_replacement.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/liblru/liblru.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/liblru/Attic/liblru.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/liblru/liblru.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/liblru/liblru.dsp 27 Mar 2002 21:01:12 -0000 1.1.2.2 @@ -1,96 +1,96 @@ -# Microsoft Developer Studio Project File - Name="liblru" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=liblru - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "liblru.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "liblru.mak" CFG="liblru - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "liblru - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "liblru - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "liblru - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "liblru - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "liblru - Win32 Release" -# Name "liblru - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\repl\lru\store_repl_lru.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="liblru" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=liblru - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "liblru.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "liblru.mak" CFG="liblru - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "liblru - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "liblru - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "liblru - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "liblru - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "liblru - Win32 Release" +# Name "liblru - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\repl\lru\store_repl_lru.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# End Target +# End Project Index: squid/port/win32/libmiscutil/libmiscutil.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libmiscutil/Attic/libmiscutil.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libmiscutil/libmiscutil.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/libmiscutil/libmiscutil.dsp 27 Mar 2002 21:01:12 -0000 1.1.2.2 @@ -1,208 +1,208 @@ -# Microsoft Developer Studio Project File - Name="libmiscutil" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libmiscutil - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libmiscutil.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libmiscutil.mak" CFG="libmiscutil - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libmiscutil - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libmiscutil - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libmiscutil - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /I "../../../src" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libmiscutil - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /I "../../../src" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libmiscutil - Win32 Release" -# Name "libmiscutil - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\lib\Array.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\base64.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\drand48.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\getfullhostname.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\hash.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\heap.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\html_quote.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\iso3307.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\md5.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\radix.c -# End Source File -# Begin Source File - -SOURCE=..\src\readdir.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\rfc1035.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\rfc1123.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\rfc1738.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\rfc2617.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\safe_inet_addr.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\snprintf.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\splay.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\Stack.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\stub_memaccount.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\util.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\uudecode.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\lib\win32lib.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\include\heap.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\md5.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\parse.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\radix.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snprintf.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\util.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libmiscutil" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libmiscutil - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libmiscutil.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libmiscutil.mak" CFG="libmiscutil - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libmiscutil - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libmiscutil - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libmiscutil - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /I "../../../src" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libmiscutil - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /I "../../../src" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libmiscutil - Win32 Release" +# Name "libmiscutil - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\lib\Array.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\base64.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\drand48.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\getfullhostname.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\hash.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\heap.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\html_quote.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\iso3307.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\md5.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\radix.c +# End Source File +# Begin Source File + +SOURCE=..\src\readdir.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\rfc1035.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\rfc1123.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\rfc1738.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\rfc2617.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\safe_inet_addr.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\snprintf.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\splay.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\Stack.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\stub_memaccount.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\util.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\uudecode.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lib\win32lib.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\include\heap.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\md5.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\parse.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\radix.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snprintf.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\util.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/libntlm/libntlm.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libntlm/Attic/libntlm.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libntlm/libntlm.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/libntlm/libntlm.dsp 27 Mar 2002 21:01:13 -0000 1.1.2.2 @@ -1,100 +1,100 @@ -# Microsoft Developer Studio Project File - Name="libntlm" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libntlm - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libntlm.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libntlm.mak" CFG="libntlm - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libntlm - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libntlm - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libntlm - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libntlm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libntlm - Win32 Release" -# Name "libntlm - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\auth\ntlm\auth_ntlm.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\auth\ntlm\auth_ntlm.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libntlm" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libntlm - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libntlm.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libntlm.mak" CFG="libntlm - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libntlm - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libntlm - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libntlm - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libntlm - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libntlm - Win32 Release" +# Name "libntlm - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\auth\ntlm\auth_ntlm.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\auth\ntlm\auth_ntlm.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/libntlmauth/libntlmauth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libntlmauth/Attic/libntlmauth.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libntlmauth/libntlmauth.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/libntlmauth/libntlmauth.dsp 27 Mar 2002 21:01:13 -0000 1.1.2.2 @@ -1,100 +1,100 @@ -# Microsoft Developer Studio Project File - Name="libntlmauth" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libntlmauth - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libntlmauth.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libntlmauth.mak" CFG="libntlmauth - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libntlmauth - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libntlmauth - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libntlmauth - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libntlmauth - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libntlmauth - Win32 Release" -# Name "libntlmauth - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\lib\ntlmauth.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\include\ntlmauth.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libntlmauth" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libntlmauth - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libntlmauth.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libntlmauth.mak" CFG="libntlmauth - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libntlmauth - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libntlmauth - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libntlmauth - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libntlmauth - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libntlmauth - Win32 Release" +# Name "libntlmauth - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\lib\ntlmauth.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\include\ntlmauth.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/libsnmp/libsnmp.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libsnmp/Attic/libsnmp.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libsnmp/libsnmp.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/libsnmp/libsnmp.dsp 27 Mar 2002 21:01:13 -0000 1.1.2.2 @@ -1,204 +1,204 @@ -# Microsoft Developer Studio Project File - Name="libsnmp" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libsnmp - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libsnmp.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libsnmp.mak" CFG="libsnmp - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libsnmp - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libsnmp - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libsnmp - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libsnmp - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libsnmp - Win32 Release" -# Name "libsnmp - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\snmplib\asn1.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\coexistance.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\mib.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\parse.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmp_api.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmp_api_error.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmp_error.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmp_msg.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmp_pdu.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmp_vars.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\snmplib\snmplib_debug.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE="..\..\..\include\snmp-internal.h" -# End Source File -# Begin Source File - -SOURCE="..\..\..\include\snmp-mib.h" -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_api.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_api_error.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_api_util.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_client.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_coexist.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_compat.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_debug.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_error.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_impl.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_msg.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_pdu.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_session.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_util.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\include\snmp_vars.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libsnmp" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libsnmp - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libsnmp.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libsnmp.mak" CFG="libsnmp - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libsnmp - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libsnmp - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libsnmp - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libsnmp - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libsnmp - Win32 Release" +# Name "libsnmp - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\snmplib\asn1.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\coexistance.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\mib.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\parse.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmp_api.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmp_api_error.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmp_error.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmp_msg.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmp_pdu.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmp_vars.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\snmplib\snmplib_debug.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="..\..\..\include\snmp-internal.h" +# End Source File +# Begin Source File + +SOURCE="..\..\..\include\snmp-mib.h" +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_api.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_api_error.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_api_util.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_client.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_coexist.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_compat.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_debug.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_error.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_impl.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_msg.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_pdu.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_session.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_util.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\include\snmp_vars.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/libufs/libufs.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/libufs/Attic/libufs.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/libufs/libufs.dsp 16 Mar 2002 17:54:34 -0000 1.1.2.1 +++ squid/port/win32/libufs/libufs.dsp 27 Mar 2002 21:01:14 -0000 1.1.2.2 @@ -1,104 +1,104 @@ -# Microsoft Developer Studio Project File - Name="libufs" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libufs - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libufs.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libufs.mak" CFG="libufs - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libufs - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libufs - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libufs - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libufs - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libufs - Win32 Release" -# Name "libufs - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\fs\ufs\store_dir_ufs.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fs\ufs\store_io_ufs.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\fs\ufs\store_ufs.h -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libufs" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libufs - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libufs.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libufs.mak" CFG="libufs - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libufs - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libufs - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libufs - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libufs - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libufs - Win32 Release" +# Name "libufs - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\fs\ufs\store_dir_ufs.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fs\ufs\store_io_ufs.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\fs\ufs\store_ufs.h +# End Source File +# End Group +# End Target +# End Project Index: squid/port/win32/nt_auth/nt_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/nt_auth/Attic/nt_auth.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/nt_auth/nt_auth.dsp 23 Mar 2002 10:35:25 -0000 1.1.2.1 +++ squid/port/win32/nt_auth/nt_auth.dsp 27 Mar 2002 21:01:14 -0000 1.1.2.2 @@ -1,110 +1,110 @@ -# Microsoft Developer Studio Project File - Name="nt_auth" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=nt_auth - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "nt_auth.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "nt_auth.mak" CFG="nt_auth - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "nt_auth - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "nt_auth - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "nt_auth - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 advapi32.lib netapi32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "nt_auth - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 advapi32.lib netapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "nt_auth - Win32 Release" -# Name "nt_auth - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\auth\basic\helpers\win32_locallogon\NT_auth.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\auth\basic\helpers\win32_locallogon\valid.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\auth\basic\helpers\win32_locallogon\valid.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="nt_auth" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=nt_auth - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "nt_auth.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "nt_auth.mak" CFG="nt_auth - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "nt_auth - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "nt_auth - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "nt_auth - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 advapi32.lib netapi32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "nt_auth - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 advapi32.lib netapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "nt_auth - Win32 Release" +# Name "nt_auth - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\helpers\win32_locallogon\NT_auth.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\helpers\win32_locallogon\valid.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\auth\basic\helpers\win32_locallogon\valid.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project --- /dev/null Wed Feb 14 00:55:47 2007 +++ squid/port/win32/pinger/pinger.dsp Wed Feb 14 00:57:32 2007 @@ -0,0 +1,110 @@ +# Microsoft Developer Studio Project File - Name="pinger" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=pinger - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "pinger.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "pinger.mak" CFG="pinger - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "pinger - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "pinger - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "pinger - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /D "PINGER" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "pinger - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /D "PINGER" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "pinger - Win32 Release" +# Name "pinger - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\debug.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\globals.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\pinger.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid/port/win32/squid/squid.dsp 18 Mar 2002 22:33:48 -0000 1.1.2.3 +++ squid/port/win32/squid/squid.dsp 27 Mar 2002 21:01:14 -0000 1.1.2.4 @@ -1,514 +1,510 @@ -# Microsoft Developer Studio Project File - Name="squid" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=squid - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "squid.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "squid.mak" CFG="squid - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "squid - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "squid - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "squid - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../" /I "../include" /I "../../../include" /I "../../../src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D DEFAULT_CONFIG_FILE=\"squid.conf\" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib iphlpapi.lib /nologo /subsystem:console /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=..\update.cmd release c:\squid -# End Special Build Tool - -!ELSEIF "$(CFG)" == "squid - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../../include" /I "../../../src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D DEFAULT_CONFIG_FILE=\"squid.conf\" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib iphlpapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=..\update.cmd debug c:\squid -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "squid - Win32 Release" -# Name "squid - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\access_log.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\acl.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\asn.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\auth_modules.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\authenticate.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\cache_cf.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\cache_manager.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\CacheDigest.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\carp.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\cbdata.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\client_db.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\client_side.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\comm.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\comm_select.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\debug.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\delay_pools.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\disk.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\dns_internal.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\errorpage.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\ETag.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\event.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fd.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\filemap.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\forward.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\fqdncache.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\ftp.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\globals.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\gopher.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\helper.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\htcp.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\http.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpBody.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpHdrCc.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpHdrContRange.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpHdrRange.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpHeader.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpHeaderTools.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpMsg.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpReply.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpRequest.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\HttpStatusLine.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\icmp.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\icp_v2.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\icp_v3.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\ident.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\internal.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\ipc.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\ipcache.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\leakfinder.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\logfile.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\main.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\mem.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\MemBuf.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\MemPool.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\mime.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\multicast.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\neighbors.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\net_db.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\Packer.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\pconn.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\peer_digest.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\peer_select.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\redirect.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\referer.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\refresh.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\repl_modules.c -# End Source File -# Begin Source File - -SOURCE="..\..\..\src\send-announce.c" -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\snmp_agent.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\snmp_core.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\ssl.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\stat.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\StatHist.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\stmem.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_client.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_digest.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_dir.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_io.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_key_md5.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_log.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_modules.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_rebuild.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_swapin.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_swapmeta.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\store_swapout.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\String.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\string_arrays.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\tools.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\unlinkd.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\url.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\urn.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\useragent.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\wais.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\wccp.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\whois.c -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\win32.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\..\..\src\defines.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\enums.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\protos.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\squid.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\structs.h -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\typedefs.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="squid" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=squid - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "squid.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "squid.mak" CFG="squid - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "squid - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "squid - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "squid - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../" /I "../include" /I "../../../include" /I "../../../src" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib iphlpapi.lib /nologo /subsystem:console /machine:I386 +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=..\update.cmd release c:\squid +# End Special Build Tool + +!ELSEIF "$(CFG)" == "squid - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../../../include" /I "../../../src" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib advapi32.lib psapi.lib iphlpapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Cmds=..\update.cmd debug c:\squid +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "squid - Win32 Release" +# Name "squid - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\access_log.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\acl.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\asn.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\auth_modules.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\authenticate.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\cache_cf.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\cache_manager.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\CacheDigest.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\carp.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\cbdata.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\client_db.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\client_side.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\comm.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\comm_select.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\debug.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\delay_pools.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\disk.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\dns_internal.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\errorpage.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ETag.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\event.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fd.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\filemap.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\forward.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\fqdncache.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ftp.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\globals.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\gopher.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\helper.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\http.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpBody.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpHdrCc.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpHdrContRange.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpHdrRange.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpHeader.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpHeaderTools.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpMsg.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpReply.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpRequest.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\HttpStatusLine.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\icmp.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\icp_v2.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\icp_v3.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ident.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\internal.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ipc.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ipcache.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\leakfinder.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\logfile.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\main.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\mem.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\MemBuf.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\MemPool.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\mime.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\multicast.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\neighbors.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\net_db.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\Packer.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\pconn.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\peer_digest.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\peer_select.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\redirect.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\referer.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\refresh.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\repl_modules.c +# End Source File +# Begin Source File + +SOURCE="..\..\..\src\send-announce.c" +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\snmp_agent.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\snmp_core.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\ssl.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\stat.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\StatHist.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\stmem.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_client.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_digest.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_dir.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_io.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_key_md5.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_log.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_modules.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_rebuild.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_swapin.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_swapmeta.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\store_swapout.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\String.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\string_arrays.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\tools.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\unlinkd.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\url.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\urn.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\useragent.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\wais.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\wccp.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\whois.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\win32.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\..\..\src\defines.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\enums.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\protos.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\squid.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\structs.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\typedefs.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/squidclient/squidclient.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/squidclient/Attic/squidclient.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/squidclient/squidclient.dsp 23 Mar 2002 10:35:25 -0000 1.1.2.1 +++ squid/port/win32/squidclient/squidclient.dsp 27 Mar 2002 21:01:14 -0000 1.1.2.2 @@ -1,102 +1,102 @@ -# Microsoft Developer Studio Project File - Name="squidclient" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=squidclient - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "squidclient.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "squidclient.mak" CFG="squidclient - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "squidclient - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "squidclient - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "squidclient - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "squidclient - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "squidclient - Win32 Release" -# Name "squidclient - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\client.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="squidclient" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=squidclient - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "squidclient.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "squidclient.mak" CFG="squidclient - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "squidclient - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "squidclient - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "squidclient - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "squidclient - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "squidclient - Win32 Release" +# Name "squidclient - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\client.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/port/win32/unlinkd/unlinkd.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/unlinkd/Attic/unlinkd.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/port/win32/unlinkd/unlinkd.dsp 23 Mar 2002 10:35:25 -0000 1.1.2.1 +++ squid/port/win32/unlinkd/unlinkd.dsp 27 Mar 2002 21:01:14 -0000 1.1.2.2 @@ -1,102 +1,102 @@ -# Microsoft Developer Studio Project File - Name="unlinkd" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=unlinkd - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "unlinkd.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "unlinkd.mak" CFG="unlinkd - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "unlinkd - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "unlinkd - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "unlinkd - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "UNLINK_DAEMON" /YX /FD /c -# ADD BASE RSC /l 0x410 /d "NDEBUG" -# ADD RSC /l 0x410 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "unlinkd - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "UNLINK_DAEMON" /YX /FD /GZ /c -# ADD BASE RSC /l 0x410 /d "_DEBUG" -# ADD RSC /l 0x410 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "unlinkd - Win32 Release" -# Name "unlinkd - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\..\..\src\unlinkd.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="unlinkd" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=unlinkd - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "unlinkd.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "unlinkd.mak" CFG="unlinkd - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "unlinkd - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "unlinkd - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "unlinkd - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /O2 /I "../../../include" /I "../../../src" /I "../include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "UNLINK_DAEMON" /D "HAVE_CONFIG_H" /YX /FD /c +# ADD BASE RSC /l 0x410 /d "NDEBUG" +# ADD RSC /l 0x410 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "unlinkd - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /G6 /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "UNLINK_DAEMON" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE RSC /l 0x410 /d "_DEBUG" +# ADD RSC /l 0x410 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "unlinkd - Win32 Release" +# Name "unlinkd - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\..\..\src\unlinkd.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project Index: squid/src/cache_manager.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/cache_manager.c,v retrieving revision 1.7 retrieving revision 1.7.62.1 diff -u -r1.7 -r1.7.62.1 --- squid/src/cache_manager.c 23 Feb 2001 21:03:30 -0000 1.7 +++ squid/src/cache_manager.c 27 Mar 2002 21:01:14 -0000 1.7.62.1 @@ -1,6 +1,6 @@ /* - * $Id: cache_manager.c,v 1.7 2001/02/23 21:03:30 hno Exp $ + * $Id: cache_manager.c,v 1.7.62.1 2002/03/27 21:01:14 serassio Exp $ * * DEBUG: section 16 Cache Manager Objects * AUTHOR: Duane Wessels @@ -284,6 +284,14 @@ } static void +cachemgrReconfigure(StoreEntry * sentry) +{ + debug(16, 0) ("Reconfigure by command.\n"); + reconfigure(SIGHUP); + storeAppendPrintf(sentry, "Reconfiguring Squid Process ...."); +} + +static void cachemgrOfflineToggle(StoreEntry * sentry) { Config.onoff.offline = !Config.onoff.offline; @@ -343,6 +351,9 @@ cachemgrRegister("shutdown", "Shut Down the Squid Process", cachemgrShutdown, 1, 1); + cachemgrRegister("reconfigure", + "Reconfigure the Squid Process", + cachemgrReconfigure, 1, 1); cachemgrRegister("offline_toggle", "Toggle offline_mode setting", cachemgrOfflineToggle, 1, 1); Index: squid/src/cf.data.pre =================================================================== RCS file: /cvsroot/squid-sf//squid/src/cf.data.pre,v retrieving revision 1.49.2.5 retrieving revision 1.49.2.5.4.1 diff -u -r1.49.2.5 -r1.49.2.5.4.1 --- squid/src/cf.data.pre 25 Feb 2002 03:17:01 -0000 1.49.2.5 +++ squid/src/cf.data.pre 27 Mar 2002 21:01:14 -0000 1.49.2.5.4.1 @@ -1,6 +1,6 @@ # -# $Id: cf.data.pre,v 1.49.2.5 2002/02/25 03:17:01 squidadm Exp $ +# $Id: cf.data.pre,v 1.49.2.5.4.1 2002/03/27 21:01:14 serassio Exp $ # # # SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -1108,7 +1108,7 @@ NAME: hosts_file TYPE: string -DEFAULT: /etc/hosts +DEFAULT: @DEFAULT_HOSTS@ LOC: Config.etcHostsPath DOC_START Location of the host-local IP name-address associations Index: squid/src/comm_select.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/comm_select.c,v retrieving revision 1.8.10.2 retrieving revision 1.8.10.3 diff -u -r1.8.10.2 -r1.8.10.3 --- squid/src/comm_select.c 23 Mar 2002 10:35:25 -0000 1.8.10.2 +++ squid/src/comm_select.c 27 Mar 2002 21:01:17 -0000 1.8.10.3 @@ -1,6 +1,6 @@ /* - * $Id: comm_select.c,v 1.8.10.2 2002/03/23 10:35:25 serassio Exp $ + * $Id: comm_select.c,v 1.8.10.3 2002/03/27 21:01:17 serassio Exp $ * * DEBUG: section 5 Socket Functions * @@ -829,7 +829,8 @@ no_bits = 1; for (j = 0; j < (int) readfds.fd_count; j++) { for ( fd = Biggest_FD; fd; fd-- ) { - if ( _get_osfhandle(fd) == readfds.fd_array[j] ) { + if (( _get_osfhandle(fd) == readfds.fd_array[j] ) || + ( _get_osfhandle(fd) == pendingfds.fd_array[j] )) { no_bits = 0; break; } Index: squid/src/debug.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/debug.c,v retrieving revision 1.9.10.3 retrieving revision 1.9.10.4 diff -u -r1.9.10.3 -r1.9.10.4 --- squid/src/debug.c 23 Mar 2002 10:51:55 -0000 1.9.10.3 +++ squid/src/debug.c 27 Mar 2002 21:01:17 -0000 1.9.10.4 @@ -1,6 +1,6 @@ /* - * $Id: debug.c,v 1.9.10.3 2002/03/23 10:51:55 serassio Exp $ + * $Id: debug.c,v 1.9.10.4 2002/03/27 21:01:17 serassio Exp $ * * DEBUG: section 0 Debug Routines * AUTHOR: Harvest Derived @@ -45,6 +45,10 @@ static void _db_print_stderr(const char *format, va_list args); static void _db_print_file(const char *format, va_list args); +#ifdef _SQUID_MSWIN_ +extern LPCRITICAL_SECTION dbg_mutex; +#endif + void #if STDC_HEADERS _db_print(const char *format,...) @@ -64,6 +68,39 @@ #define args2 args1 #define args3 args1 #endif +#if defined (_SQUID_MSWIN_) && !defined(PINGER) + /* Multiple WIN32 threads may call this simultaneously */ + if (!dbg_mutex) { + HMODULE krnl_lib = GetModuleHandle("Kernel32"); + BOOL(FAR WINAPI * InitializeCriticalSectionAndSpinCount) + (LPCRITICAL_SECTION, DWORD) = NULL; + if (krnl_lib) + (FARPROC) InitializeCriticalSectionAndSpinCount = + GetProcAddress(krnl_lib, + "InitializeCriticalSectionAndSpinCount"); + dbg_mutex = xcalloc(1, sizeof(CRITICAL_SECTION)); + + __try { + if (InitializeCriticalSectionAndSpinCount) { + /* let multiprocessor systems EnterCriticalSection() fast */ + if (!InitializeCriticalSectionAndSpinCount(dbg_mutex, 4000)) + RaiseException(STATUS_NO_MEMORY, 0, 0, NULL); + } else + InitializeCriticalSection(dbg_mutex); + } + __except(STATUS_NO_MEMORY == + GetExceptionCode()? EXCEPTION_EXECUTE_HANDLER : + EXCEPTION_CONTINUE_SEARCH) { + if (debug_log) { + fprintf(debug_log, "FATAL: _db_print: can't initialize critical section\n"); + fflush(debug_log); + } + fprintf(stderr, "FATAL: _db_print: can't initialize critical section\n"); + abort(); + } + } + EnterCriticalSection(dbg_mutex); +#endif /* give a chance to context-based debugging to print current context */ if (!Ctx_Lock) ctx_print(); @@ -82,6 +119,9 @@ #if HAVE_SYSLOG _db_print_syslog(format, args3); #endif +#if defined (_SQUID_MSWIN_) && !defined(PINGER) + LeaveCriticalSection(dbg_mutex); +#endif va_end(args1); #if STDC_HEADERS va_end(args2); Index: squid/src/defines.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/defines.h,v retrieving revision 1.15.10.1 retrieving revision 1.15.10.2 diff -u -r1.15.10.1 -r1.15.10.2 --- squid/src/defines.h 17 Mar 2002 18:16:06 -0000 1.15.10.1 +++ squid/src/defines.h 27 Mar 2002 21:01:17 -0000 1.15.10.2 @@ -1,6 +1,6 @@ /* - * $Id: defines.h,v 1.15.10.1 2002/03/17 18:16:06 serassio Exp $ + * $Id: defines.h,v 1.15.10.2 2002/03/27 21:01:17 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -218,7 +218,9 @@ #define N_COUNT_HOUR_HIST (86400 * 3) / (60 * COUNT_INTERVAL) /* were to look for errors if config path fails */ +#ifndef DEFAULT_SQUID_ERROR_DIR #define DEFAULT_SQUID_ERROR_DIR "/usr/local/squid/etc/errors" +#endif /* gb_type operations */ #define gb_flush_limit (0x3FFFFFFF) Index: squid/src/globals.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/globals.h,v retrieving revision 1.14.14.1 retrieving revision 1.14.14.2 diff -u -r1.14.14.1 -r1.14.14.2 --- squid/src/globals.h 14 Mar 2002 20:23:44 -0000 1.14.14.1 +++ squid/src/globals.h 27 Mar 2002 21:01:17 -0000 1.14.14.2 @@ -1,6 +1,6 @@ /* - * $Id: globals.h,v 1.14.14.1 2002/03/14 20:23:44 serassio Exp $ + * $Id: globals.h,v 1.14.14.2 2002/03/27 21:01:17 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -164,9 +164,9 @@ extern char *WIN32_Command_Line; /* NULL */ extern char *WIN32_Service_Command_Line; /* NULL */ extern unsigned int WIN32_run_mode; /* _WIN_SQUID_RUN_MODE_INTERACTIVE */ -#if defined(_SQUID_MSWIN_) && defined(_DEBUG) -extern int do_debug; /* 0 */ -#endif +#if defined(_SQUID_MSWIN_) && defined(_DEBUG) +extern int do_debug; /* 0 */ +#endif #endif #endif /* SQUID_GLOBALS_H */ Index: squid/src/icmp.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/icmp.c,v retrieving revision 1.4 retrieving revision 1.4.74.1 diff -u -r1.4 -r1.4.74.1 --- squid/src/icmp.c 12 Jan 2001 08:20:33 -0000 1.4 +++ squid/src/icmp.c 27 Mar 2002 21:01:17 -0000 1.4.74.1 @@ -1,6 +1,6 @@ /* - * $Id: icmp.c,v 1.4 2001/01/12 08:20:33 hno Exp $ + * $Id: icmp.c,v 1.4.74.1 2002/03/27 21:01:17 serassio Exp $ * * DEBUG: section 37 ICMP Routines * AUTHOR: Duane Wessels @@ -33,7 +33,8 @@ * */ - +#ifndef ICMP_C +#define ICMP_C #include "squid.h" #if USE_ICMP @@ -50,6 +51,11 @@ static void icmpHandleSourcePing(const struct sockaddr_in *from, const char *buf); #endif +#ifdef _SQUID_MSWIN_ +static HANDLE hIpc; +static pid_t pid; +#endif + static void icmpSendEcho(struct in_addr to, int opcode, const char *payload, int len) { @@ -201,7 +207,11 @@ args, "Pinger Socket", &rfd, - &wfd); + &wfd +#ifdef _SQUID_MSWIN_ + , &hIpc, &pid +#endif + ); if (x < 0) return; assert(rfd == wfd); @@ -219,7 +229,22 @@ if (icmp_sock < 0) return; debug(29, 1) ("Closing Pinger socket on FD %d\n", icmp_sock); +#ifdef _SQUID_MSWIN_ + send(icmp_sock, "$shutdown\n", 10, 0); +#endif comm_close(icmp_sock); +#ifdef _SQUID_MSWIN_ + if (hIpc) { + if (WaitForSingleObject(hIpc, 12000) != WAIT_OBJECT_0) { + getCurrentTime(); + debug(34, 1) + ("icmpClose: WARNING: (pinger,%ld) didn't exit in 12 seconds\n", + pid); + } + CloseHandle(hIpc); + } +#endif icmp_sock = -1; #endif } +#endif /* ICMP_C */ Index: squid/src/ipc.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/ipc.c,v retrieving revision 1.7.10.2 retrieving revision 1.7.10.3 diff -u -r1.7.10.2 -r1.7.10.3 --- squid/src/ipc.c 17 Mar 2002 18:16:06 -0000 1.7.10.2 +++ squid/src/ipc.c 27 Mar 2002 21:01:18 -0000 1.7.10.3 @@ -1,6 +1,6 @@ /* - * $Id: ipc.c,v 1.7.10.2 2002/03/17 18:16:06 serassio Exp $ + * $Id: ipc.c,v 1.7.10.3 2002/03/27 21:01:18 serassio Exp $ * * DEBUG: section 54 Interprocess Communication * AUTHOR: Duane Wessels @@ -443,7 +443,7 @@ debug(50, 0) ("write FD %d: %s\n", cwfd, xstrerror()); debug(50, 0) ("ipcCreate: CHILD: hello write test failed\n"); _exit(1); - } +// } } #endif #if HAVE_PUTENV Index: squid/src/main.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/main.c,v retrieving revision 1.28.6.1.4.1 retrieving revision 1.28.6.1.4.2 diff -u -r1.28.6.1.4.1 -r1.28.6.1.4.2 --- squid/src/main.c 14 Mar 2002 20:23:44 -0000 1.28.6.1.4.1 +++ squid/src/main.c 27 Mar 2002 21:01:18 -0000 1.28.6.1.4.2 @@ -1,6 +1,6 @@ /* - * $Id: main.c,v 1.28.6.1.4.1 2002/03/14 20:23:44 serassio Exp $ + * $Id: main.c,v 1.28.6.1.4.2 2002/03/27 21:01:18 serassio Exp $ * * DEBUG: section 1 Startup and Main Loop * AUTHOR: Harvest Derived @@ -427,6 +427,9 @@ #else idnsInit(); #endif +#ifdef _SQUID_MSWIN_ + icmpOpen(); +#endif redirectInit(); authenticateInit(&Config.authConfig); #if USE_WCCP @@ -450,6 +453,9 @@ mainRotate(void) { icmpClose(); +#ifdef _SQUID_MSWIN_ + unlinkdClose(); +#endif #if USE_DNSSERVERS dnsShutdown(); #endif @@ -470,6 +476,9 @@ #endif redirectInit(); authenticateInit(&Config.authConfig); +#ifdef _SQUID_MSWIN_ + unlinkdInit(); +#endif } static void @@ -579,6 +588,9 @@ malloc_debug(0, malloc_debug_level); #endif +#ifdef _SQUID_MSWIN_ + icmpOpen(); +#endif if (!configured_once) { #if USE_UNLINKD unlinkdInit(); Index: squid/src/pinger.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/pinger.c,v retrieving revision 1.4 retrieving revision 1.4.74.1 diff -u -r1.4 -r1.4.74.1 --- squid/src/pinger.c 12 Jan 2001 08:20:33 -0000 1.4 +++ squid/src/pinger.c 27 Mar 2002 21:01:18 -0000 1.4.74.1 @@ -1,6 +1,6 @@ /* - * $Id: pinger.c,v 1.4 2001/01/12 08:20:33 hno Exp $ + * $Id: pinger.c,v 1.4.74.1 2002/03/27 21:01:18 serassio Exp $ * * DEBUG: section 42 ICMP Pinger program * AUTHOR: Duane Wessels @@ -37,17 +37,58 @@ #if USE_ICMP +#ifndef _SQUID_MSWIN_ #include #include #include #include +#else +#include +#include + +#define ICMP_ECHO 8 +#define ICMP_ECHOREPLY 0 + +typedef struct iphdr +{ + BYTE ip_vhl:4; /* Length of the header in dwords */ + BYTE version:4; /* Version of IP */ + BYTE tos; /* Type of service */ + USHORT total_len; /* Length of the packet in dwords */ + USHORT ident; /* unique identifier */ + USHORT flags; /* Flags */ + BYTE ip_ttl; /* Time to live */ + BYTE proto; /* Protocol number (TCP, UDP etc) */ + USHORT checksum; /* IP checksum */ + ULONG source_ip; + ULONG dest_ip; +} +iphdr; + +/* ICMP header */ +typedef struct icmphdr +{ + BYTE icmp_type; /* ICMP packet type */ + BYTE icmp_code; /* Type sub code */ + USHORT icmp_cksum; + USHORT icmp_id; + USHORT icmp_seq; + ULONG timestamp; /* not part of ICMP, but we need it */ +} +icmphdr; + +static SOCKET squid_sock = -1; + +#endif /* _SQUID_MSWIN_ */ #ifndef _SQUID_LINUX_ #ifndef _SQUID_CYGWIN_ +#ifndef _SQUID_MSWIN_ #define icmphdr icmp #define iphdr ip #endif #endif +#endif #if defined (_SQUID_LINUX_) || defined (_SQUID_CYGWIN_) #ifdef icmp_id @@ -123,6 +164,38 @@ pingerOpen(void) { struct protoent *proto = NULL; +#ifdef _SQUID_MSWIN_ + WSADATA wsaData; + WSAPROTOCOL_INFO wpi; + char buf[sizeof(wpi)]; + int x; + struct sockaddr_in PS; + + WSAStartup(2, &wsaData); + + getCurrentTime(); + _db_init(NULL, "ALL,1"); + setmode(0, O_BINARY); + setmode(1, O_BINARY); + x = read(0, buf, sizeof(wpi)); + if (x < sizeof(wpi)) { + getCurrentTime(); + debug(42, 0) ("pingerOpen: read: FD 0: %s\n", xstrerror()); + write(1, "ERR\n", 4); + exit(1); + } + xmemcpy(&wpi, buf, sizeof(wpi)); + + write(1, "OK\n", 3); + x = read(0, buf, sizeof(PS)); + if (x < sizeof(PS)) { + getCurrentTime(); + debug(42, 0) ("pingerOpen: read: FD 0: %s\n", xstrerror()); + write(1, "ERR\n", 4); + exit(1); + } + xmemcpy(&PS, buf, sizeof(PS)); +#endif if ((proto = getprotobyname("icmp")) == 0) { debug(42, 0) ("pingerOpen: unknown protocol: icmp\n"); exit(1); @@ -134,12 +207,50 @@ } icmp_ident = getpid() & 0xffff; debug(42, 0) ("pinger: ICMP socket opened\n"); +#ifdef _SQUID_MSWIN_ + squid_sock = + WSASocket(FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, FROM_PROTOCOL_INFO, + &wpi, 0, 0); + if (squid_sock == INVALID_SOCKET) { + getCurrentTime(); + debug(42, 0) ("pingerOpen: WSASocket: %s\n", xstrerror()); + write(1, "ERR\n", 4); + exit(1); + } + x = connect(squid_sock, (struct sockaddr *) &PS, sizeof(PS)); + if (SOCKET_ERROR == x) { + getCurrentTime(); + debug(42, 0) ("pingerOpen: connect: %s\n", xstrerror()); + write(1, "ERR\n", 4); + exit(1); + } + write(1, "OK\n", 3); + memset(buf, 0, sizeof(buf)); + x = recv(squid_sock, buf, sizeof(buf), 0); + if (x < 3) { + debug(42, 0) ("icmpOpen: recv: %s\n", xstrerror()); + exit(1); + } + x = send(squid_sock, buf, strlen(buf), 0); + if (x < 3 || strncmp("OK\n", buf, 3)) { + debug(42, 0) ("icmpOpen: recv: %s\n", xstrerror()); + exit(1); + } + + getCurrentTime(); + debug(42, 0) ("pinger: Squid socket opened\n"); +#endif } void pingerClose(void) { close(icmp_sock); +#ifdef _SQUID_MSWIN_ + shutdown(squid_sock, SD_BOTH); + close(squid_sock); + squid_sock = -1; +#endif icmp_sock = -1; icmp_ident = 0; } @@ -307,7 +418,11 @@ int n; int guess_size; memset(&pecho, '\0', sizeof(pecho)); +#ifdef _SQUID_MSWIN_ + n = recv(squid_sock, (char *) &pecho, sizeof(pecho), 0); +#else n = recv(0, (char *) &pecho, sizeof(pecho), 0); +#endif if (n < 0) return n; if (0 == n) { @@ -334,7 +449,11 @@ pingerSendtoSquid(pingerReplyData * preply) { int len = sizeof(pingerReplyData) - MAX_PKT_SZ + preply->psize; +#ifdef _SQUID_MSWIN_ + if (send(squid_sock, (char *) preply, len, 0) < 0) { +#else if (send(1, (char *) preply, len, 0) < 0) { +#endif debug(50, 0) ("pinger: send: %s\n", xstrerror()); exit(1); } @@ -366,9 +485,14 @@ * cevans - do this first. It grabs a raw socket. After this we can * drop privs */ + pingerOpen(); +#ifndef _SQUID_MSWIN_ setgid(getgid()); setuid(getuid()); +#else + atexit(pingerClose); +#endif if ((t = getenv("SQUID_DEBUG"))) debug_args = xstrdup(t); @@ -376,25 +500,45 @@ _db_init(NULL, debug_args); for (;;) { +#ifdef _SQUID_MSWIN_ + tv.tv_sec = 5; +#else tv.tv_sec = 10; +#endif tv.tv_usec = 0; FD_ZERO(&R); +#ifdef _SQUID_MSWIN_ + FD_SET(squid_sock, &R); +#else FD_SET(0, &R); +#endif FD_SET(icmp_sock, &R); x = select(icmp_sock + 1, &R, NULL, NULL, &tv); getCurrentTime(); if (x < 0) exit(1); +#ifdef _SQUID_MSWIN_ + if (FD_ISSET(squid_sock, &R)) +#else if (FD_ISSET(0, &R)) +#endif if (pingerReadRequest() < 0) { debug(42, 0) ("Pinger exiting.\n"); exit(1); } if (FD_ISSET(icmp_sock, &R)) pingerRecv(); +#ifdef _SQUID_MSWIN_ + if (5 + last_check_time < squid_curtime) { + if (send(squid_sock, (char *) &tv, 0, 0) < 0) { + debug(42, 0) ("Pinger exiting.\n"); + exit(1); + } +#else if (10 + last_check_time < squid_curtime) { if (send(1, (char *) &tv, 0, 0) < 0) exit(1); +#endif last_check_time = squid_curtime; } } Index: squid/src/squid.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/squid.h,v retrieving revision 1.13.6.2.4.1 retrieving revision 1.13.6.2.4.2 diff -u -r1.13.6.2.4.1 -r1.13.6.2.4.2 --- squid/src/squid.h 14 Mar 2002 20:23:45 -0000 1.13.6.2.4.1 +++ squid/src/squid.h 27 Mar 2002 21:01:18 -0000 1.13.6.2.4.2 @@ -1,6 +1,6 @@ /* - * $Id: squid.h,v 1.13.6.2.4.1 2002/03/14 20:23:45 serassio Exp $ + * $Id: squid.h,v 1.13.6.2.4.2 2002/03/27 21:01:18 serassio Exp $ * * AUTHOR: Duane Wessels * @@ -479,13 +479,13 @@ #define FD_READ_METHOD(fd, buf, len) (*fd_table[fd].read_method)(fd, buf, len) #define FD_WRITE_METHOD(fd, buf, len) (*fd_table[fd].write_method)(fd, buf, len) - -#ifndef IPPROTO_UDP -#define IPPROTO_UDP 0 -#endif - -#ifndef IPPROTO_TCP -#define IPPROTO_TCP 0 -#endif + +#ifndef IPPROTO_UDP +#define IPPROTO_UDP 0 +#endif + +#ifndef IPPROTO_TCP +#define IPPROTO_TCP 0 +#endif #endif /* SQUID_H */ Index: squid/src/store_dir.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store_dir.c,v retrieving revision 1.19.14.1 retrieving revision 1.19.14.2 diff -u -r1.19.14.1 -r1.19.14.2 --- squid/src/store_dir.c 14 Mar 2002 20:23:45 -0000 1.19.14.1 +++ squid/src/store_dir.c 27 Mar 2002 21:01:18 -0000 1.19.14.2 @@ -1,6 +1,6 @@ /* - * $Id: store_dir.c,v 1.19.14.1 2002/03/14 20:23:45 serassio Exp $ + * $Id: store_dir.c,v 1.19.14.2 2002/03/27 21:01:18 serassio Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -32,8 +32,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. * */ -#ifndef STORE_DIR_C -#define STORE_DIR_C +#ifndef STORE_DIR_C +#define STORE_DIR_C #include "squid.h" #if HAVE_STATVFS @@ -79,18 +79,18 @@ { int i; SwapDir *sd; -#ifndef _SQUID_MSWIN_ +#ifndef _SQUID_MSWIN_ pid_t pid; int status; -#endif +#endif for (i = 0; i < Config.cacheSwap.n_configured; i++) { -#ifndef _SQUID_MSWIN_ +#ifndef _SQUID_MSWIN_ if (fork()) continue; -#endif +#endif sd = &Config.cacheSwap.swapDirs[i]; sd->newfs(sd); -#ifndef _SQUID_MSWIN_ +#ifndef _SQUID_MSWIN_ exit(0); } do { @@ -100,9 +100,9 @@ pid = waitpid(-1, &status, 0); #endif } while (pid > 0 || (pid < 0 && errno == EINTR)); -#else - } -#endif +#else + } +#endif } /* @@ -551,4 +551,4 @@ #endif return 0; } -#endif +#endif Index: squid/src/store_io.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/store_io.c,v retrieving revision 1.3.14.1 retrieving revision 1.3.14.2 diff -u -r1.3.14.1 -r1.3.14.2 --- squid/src/store_io.c 14 Mar 2002 20:23:45 -0000 1.3.14.1 +++ squid/src/store_io.c 27 Mar 2002 21:01:18 -0000 1.3.14.2 @@ -1,5 +1,5 @@ -#ifndef STORE_IO_C -#define STORE_IO_C +#ifndef STORE_IO_C +#define STORE_IO_C #include "squid.h" static struct { @@ -117,4 +117,4 @@ storeAppendPrintf(sentry, "create.create_fail %d\n", store_io_stats.create.create_fail); storeAppendPrintf(sentry, "create.success %d\n", store_io_stats.create.success); } -#endif +#endif Index: squid/src/structs.h =================================================================== RCS file: /cvsroot/squid-sf//squid/src/structs.h,v retrieving revision 1.48.6.1 retrieving revision 1.48.6.2 diff -u -r1.48.6.1 -r1.48.6.2 --- squid/src/structs.h 14 Mar 2002 20:23:45 -0000 1.48.6.1 +++ squid/src/structs.h 27 Mar 2002 21:01:18 -0000 1.48.6.2 @@ -1,6 +1,6 @@ /* - * $Id: structs.h,v 1.48.6.1 2002/03/14 20:23:45 serassio Exp $ + * $Id: structs.h,v 1.48.6.2 2002/03/27 21:01:18 serassio Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -748,9 +748,12 @@ unsigned int type; u_short local_port; u_short remote_port; -#ifdef _SQUID_MSWIN_ - FILE * fbuf; -#endif +#ifdef _SQUID_MSWIN_ + + FILE * fbuf; + +#endif + struct in_addr local_addr; unsigned char tos; char ipaddr[16]; /* dotted decimal address of peer */ @@ -2054,10 +2057,14 @@ struct { int uses; } stats; -#ifdef _SQUID_MSWIN_ - HANDLE hIpc; - pid_t pid; -#endif +#ifdef _SQUID_MSWIN_ + + HANDLE hIpc; + + pid_t pid; + +#endif + }; Index: squid/src/tools.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/tools.c,v retrieving revision 1.19.14.1 retrieving revision 1.19.14.2 diff -u -r1.19.14.1 -r1.19.14.2 --- squid/src/tools.c 14 Mar 2002 20:23:46 -0000 1.19.14.1 +++ squid/src/tools.c 27 Mar 2002 21:01:18 -0000 1.19.14.2 @@ -1,6 +1,6 @@ /* - * $Id: tools.c,v 1.19.14.1 2002/03/14 20:23:46 serassio Exp $ + * $Id: tools.c,v 1.19.14.2 2002/03/27 21:01:18 serassio Exp $ * * DEBUG: section 21 Misc Functions * AUTHOR: Harvest Derived @@ -305,10 +305,14 @@ void sigusr2_handle(int sig) { -#if defined(_SQUID_MSWIN_) && defined(_DEBUG) - do_debug = 1; -#endif -#if (defined(_SQUID_MSWIN_) && !defined(_DEBUG)) || !defined(_SQUID_MSWIN_) +#if defined(_SQUID_MSWIN_) && defined(_DEBUG) + + do_debug = 1; + +#endif + +#if (defined(_SQUID_MSWIN_) && !defined(_DEBUG)) || !defined(_SQUID_MSWIN_) + static int state = 0; /* no debug() here; bad things happen if the signal is delivered during _db_print() */ if (state == 0) { @@ -326,7 +330,8 @@ #endif state = 0; } -#endif +#endif + #if !HAVE_SIGACTION signal(sig, sigusr2_handle); /* reinstall */ #endif @@ -420,7 +425,8 @@ void sig_child(int sig) { -#ifndef _SQUID_MSWIN_ +#ifndef _SQUID_MSWIN_ + #ifdef _SQUID_NEXT_ union wait status; #else @@ -441,7 +447,8 @@ } while (pid > 0 || (pid < 0 && errno == EINTR)); signal(sig, sig_child); #endif -#endif +#endif + } const char * Index: squid/src/unlinkd.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/unlinkd.c,v retrieving revision 1.6.10.2 retrieving revision 1.6.10.3 diff -u -r1.6.10.2 -r1.6.10.3 --- squid/src/unlinkd.c 23 Mar 2002 10:51:55 -0000 1.6.10.2 +++ squid/src/unlinkd.c 27 Mar 2002 21:01:18 -0000 1.6.10.3 @@ -1,6 +1,6 @@ /* - * $Id: unlinkd.c,v 1.6.10.2 2002/03/23 10:51:55 serassio Exp $ + * $Id: unlinkd.c,v 1.6.10.3 2002/03/27 21:01:18 serassio Exp $ * * DEBUG: section 12 Unlink Daemon * AUTHOR: Duane Wessels @@ -81,6 +81,18 @@ #define UNLINKD_QUEUE_LIMIT 20 +static unsigned long n_successes = 0, n_failures = 0; +static void +unlinkdStats(StoreEntry * sentry) +{ + storeAppendPrintf(sentry, "Unlink Daemon Statistics:\n"); + storeAppendPrintf(sentry, + "\nNumber of requests: %lu\n" + "Number of successes: %lu\n" + "Number of failures: %lu\n", statCounter.unlink.requests, n_successes, + n_failures); +} + void unlinkdUnlink(const char *path) { @@ -126,8 +138,13 @@ if (x > 0) { rbuf[x] = '\0'; for (i = 0; i < x; i++) - if ('\n' == rbuf[i]) + if ('\n' == rbuf[i]) { + if (strncmp(rbuf, "OK\r\n", 4) && strncmp(rbuf, "OK\n", 3)) + n_failures++; + else + n_successes++; queuelen--; + } assert(queuelen >= 0); } } @@ -237,6 +254,7 @@ if (FD_PIPE == fd_table[unlinkd_wfd].type) commUnsetNonBlocking(unlinkd_wfd); debug(12, 1) ("Unlinkd pipe opened on FD %d\n", unlinkd_wfd); + cachemgrRegister("unlinkd", "Unlink Daemon Stats", unlinkdStats, 0, 1); } #endif /* ndef UNLINK_DAEMON */ Index: squid/src/win32.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/win32.c,v retrieving revision 1.5.14.2 retrieving revision 1.5.14.3 diff -u -r1.5.14.2 -r1.5.14.3 --- squid/src/win32.c 16 Mar 2002 10:31:31 -0000 1.5.14.2 +++ squid/src/win32.c 27 Mar 2002 21:01:18 -0000 1.5.14.3 @@ -50,6 +50,7 @@ #if defined(_SQUID_MSWIN_) static int Win32SockInit(void); static void Win32SockCleanup(void); +LPCRITICAL_SECTION dbg_mutex = NULL; #endif /* End native Windows NT EXPERIMENTAL PORT */ static SERVICE_STATUS svcStatus; @@ -314,6 +315,10 @@ svcStatus.dwCurrentState = SERVICE_STOPPED; SetServiceStatus(svcHandle, &svcStatus); #endif +#ifdef _SQUID_MSWIN_ + if (dbg_mutex) + DeleteCriticalSection(dbg_mutex); +#endif _exit(0); } Index: squid/src/fs/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/Makefile.am,v retrieving revision 1.2 retrieving revision 1.2.40.1 diff -u -r1.2 -r1.2.40.1 --- squid/src/fs/Makefile.am 1 Sep 2001 11:46:51 -0000 1.2 +++ squid/src/fs/Makefile.am 27 Mar 2002 21:01:19 -0000 1.2.40.1 @@ -5,14 +5,16 @@ AUTOMAKE_OPTIONS = subdir-objects -DIST_SUBDIRS = aufs coss diskd null ufs +DIST_SUBDIRS = aufs awin32 coss diskd null ufs SUBDIRS = @STORE_MODULE_SUBDIRS@ -EXTRA_LIBRARIES = libaufs.a libcoss.a libdiskd.a libnull.a libufs.a +EXTRA_LIBRARIES = libaufs.a libawin32.a libcoss.a libdiskd.a libnull.a libufs.a noinst_LIBRARIES = @STORE_LIBS@ libaufs_a_SOURCES = aufs/aiops.c aufs/async_io.c aufs/store_asyncufs.h \ aufs/store_dir_aufs.c aufs/store_io_aufs.c +libawin32_a_SOURCES = awin32/aiops.c awin32/async_io.c awin32/store_asyncufs.h \ + awin32/store_dir_aufs.c awin32/store_io_aufs.c libcoss_a_SOURCES = coss/store_coss.h coss/store_io_coss.c coss/store_dir_coss.c \ coss/async_io.c coss/async_io.h libdiskd_a_SOURCES = diskd/diskd.c diskd/store_dir_diskd.c diskd/store_diskd.h \ @@ -26,6 +28,8 @@ ## targets below to emulate distributed makefiles aufs/all: libaufs.a aufs/clean: clean +awin32/all: libawin32.a +awin32/clean: clean coss/all: libcoss.a coss/clean: clean null/all: libnull.a Index: squid/src/fs/ufs/store_dir_ufs.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/fs/ufs/store_dir_ufs.c,v retrieving revision 1.21.6.1.4.3 retrieving revision 1.21.6.1.4.4 diff -u -r1.21.6.1.4.3 -r1.21.6.1.4.4 --- squid/src/fs/ufs/store_dir_ufs.c 23 Mar 2002 11:13:50 -0000 1.21.6.1.4.3 +++ squid/src/fs/ufs/store_dir_ufs.c 27 Mar 2002 21:01:19 -0000 1.21.6.1.4.4 @@ -1591,7 +1591,6 @@ static int storeUfsCleanupDoubleCheck(SwapDir * sd, StoreEntry * e) { -#ifndef _SQUID_MSWIN_ struct stat sb; if (stat(storeUfsDirFullPath(sd, e->swap_filen, NULL), &sb) < 0) { debug(20, 0) ("storeUfsCleanupDoubleCheck: MISSING SWAP FILE\n"); @@ -1611,7 +1610,6 @@ storeEntryDump(e, 0); return -1; } -#endif return 0; }