--------------------- PatchSet 3652 Date: 2002/02/03 15:28:51 Author: serassio Branch: nt-2_3 Tag: (none) Log: WIN32_getrusage moved bach to win32.c, backported SNMP patches from HEAD, fixed socket related compile warnings Members: win/resource.h:1.1.2.1->1.1.2.2 win/cachemgr/cachemgr.dsp:1.1.2.3->1.1.2.4 win/cf_gen/cf_gen.dsp:1.1.2.2->1.1.2.3 win/client/client.dsp:1.1.2.2->1.1.2.3 win/dnsserver/dnsserver.dsp:1.1.2.3->1.1.2.4 win/miscutil/miscutil.dsp:1.1.2.3->1.1.2.4 win/squidnt/squidnt.dsp:1.1.2.7->1.1.2.8 Index: squid/win/resource.h =================================================================== RCS file: /cvsroot/squid-sf//squid/win/Attic/resource.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/win/resource.h 6 Jan 2001 12:40:17 -0000 1.1.2.1 +++ squid/win/resource.h 3 Feb 2002 15:28:51 -0000 1.1.2.2 @@ -7,7 +7,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_RESOURCE_VALUE 102 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 Index: squid/win/cachemgr/cachemgr.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/win/cachemgr/Attic/cachemgr.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/win/cachemgr/cachemgr.dsp 30 Jun 2001 18:42:07 -0000 1.1.2.3 +++ squid/win/cachemgr/cachemgr.dsp 3 Feb 2002 15:28:51 -0000 1.1.2.4 @@ -50,7 +50,7 @@ # 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 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\\" +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\\" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "cachemgr - Win32 Debug" @@ -75,7 +75,7 @@ # 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 kernel32.lib user32.lib advapi32.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\\" +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\\" !ENDIF Index: squid/win/cf_gen/cf_gen.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/win/cf_gen/Attic/cf_gen.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/win/cf_gen/cf_gen.dsp 25 Mar 2001 16:55:30 -0000 1.1.2.2 +++ squid/win/cf_gen/cf_gen.dsp 3 Feb 2002 15:28:51 -0000 1.1.2.3 @@ -50,7 +50,7 @@ # 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 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "cf_gen - Win32 Debug" @@ -75,7 +75,7 @@ # 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 kernel32.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/win/client/client.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/win/client/Attic/client.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/win/client/client.dsp 27 Jan 2002 20:03:14 -0000 1.1.2.2 +++ squid/win/client/client.dsp 3 Feb 2002 15:28:51 -0000 1.1.2.3 @@ -50,7 +50,7 @@ # 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 kernel32.lib user32.lib advapi32.lib ws2_32.lib psapi.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "client - Win32 Debug" @@ -74,7 +74,7 @@ # 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 kernel32.lib user32.lib advapi32.lib ws2_32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/win/dnsserver/dnsserver.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/win/dnsserver/Attic/dnsserver.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/win/dnsserver/dnsserver.dsp 30 Jun 2001 18:42:07 -0000 1.1.2.3 +++ squid/win/dnsserver/dnsserver.dsp 3 Feb 2002 15:28:51 -0000 1.1.2.4 @@ -53,7 +53,7 @@ # 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 /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib /nologo /dll /machine:I386 +# ADD LINK32 ws2_32.lib /nologo /dll /machine:I386 !ELSEIF "$(CFG)" == "dnsserver - Win32 Debug" @@ -79,7 +79,7 @@ # 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 /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept !ENDIF Index: squid/win/miscutil/miscutil.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/win/miscutil/Attic/miscutil.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/win/miscutil/miscutil.dsp 8 Jul 2001 10:32:00 -0000 1.1.2.3 +++ squid/win/miscutil/miscutil.dsp 3 Feb 2002 15:28:51 -0000 1.1.2.4 @@ -177,6 +177,14 @@ # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="..\..\include\squid-mswin.h" +# End Source File +# Begin Source File + +SOURCE=..\..\include\util.h +# End Source File # End Group # End Target # End Project Index: squid/win/squidnt/squidnt.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid/win/squidnt/Attic/squidnt.dsp,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -r1.1.2.7 -r1.1.2.8 --- squid/win/squidnt/squidnt.dsp 27 Jan 2002 19:47:36 -0000 1.1.2.7 +++ squid/win/squidnt/squidnt.dsp 3 Feb 2002 15:28:51 -0000 1.1.2.8 @@ -51,7 +51,7 @@ # 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 kernel32.lib user32.lib ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /machine:I386 /out:"Release/squid.exe" +# ADD LINK32 kernel32.lib ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /machine:I386 /out:"Release/squid.exe" # SUBTRACT LINK32 /profile # Begin Special Build Tool SOURCE="$(InputPath)" @@ -82,7 +82,7 @@ # 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 winwrap.lib kernel32.lib user32.lib ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/squid.exe" /pdbtype:sept +# ADD LINK32 winwrap.lib kernel32.lib ws2_32.lib advapi32.lib psapi.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/squid.exe" /pdbtype:sept # SUBTRACT LINK32 /profile # Begin Special Build Tool SOURCE="$(InputPath)" @@ -309,13 +309,6 @@ # Begin Source File SOURCE=..\..\src\leakfinder.c - -!IF "$(CFG)" == "squidnt - Win32 Release" - -!ELSEIF "$(CFG)" == "squidnt - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File @@ -508,6 +501,10 @@ # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File +SOURCE=..\..\include\config.h +# End Source File +# Begin Source File + SOURCE=..\..\src\defines.h # End Source File # Begin Source File @@ -524,6 +521,10 @@ # End Source File # Begin Source File +SOURCE="..\..\include\squid-mswin.h" +# End Source File +# Begin Source File + SOURCE=..\..\src\squid.h # End Source File # Begin Source File @@ -534,6 +535,10 @@ SOURCE=..\..\src\typedefs.h # End Source File +# Begin Source File + +SOURCE=..\..\include\util.h +# End Source File # End Group # Begin Group "Resource Files"