--------------------- PatchSet 9177 Date: 2009/08/22 16:38:24 Author: serassio Branch: nt Tag: (none) Log: Updated Visual Studio project Members: port/win32/squid.sln:1.1.2.11->1.1.2.12 port/win32/cachemgr/cachemgr.vcproj:1.1.2.4->1.1.2.5 port/win32/cf_gen/cf_gen.vcproj:1.1.2.4->1.1.2.5 port/win32/include/autoconf.h:1.2.18.22->1.2.18.23 port/win32/libcc/libcc.vcproj:1.1.2.3->1.1.2.4 port/win32/libicap/libicap.vcproj:1.1.2.3->1.1.2.4 port/win32/libmiscutil/libmiscutil.vcproj:1.1.2.11->1.1.2.12 port/win32/libntlm/libntlm.vcproj:1.1.2.2->1.1.2.3 port/win32/libntlmauth/libntlmauth.vcproj:1.1.2.2->1.1.2.3 port/win32/libsnmp/libsnmp.vcproj:1.1.2.2->1.1.2.3 port/win32/squid/squid.vcproj:1.1.2.20->1.1.2.21 Index: squid3/port/win32/squid.sln =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid.sln,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -r1.1.2.11 -r1.1.2.12 --- squid3/port/win32/squid.sln 11 Jul 2008 10:03:16 -0000 1.1.2.11 +++ squid3/port/win32/squid.sln 22 Aug 2009 16:38:24 -0000 1.1.2.12 @@ -271,6 +271,8 @@ {89F015D1-DCA7-444C-AFA0-D1E445922243} = {89F015D1-DCA7-444C-AFA0-D1E445922243} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libip", "libip\libip.vcproj", "{9F3EC1F7-7AB1-495F-9151-966C6F12DB48}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -479,6 +481,10 @@ {0FFF4160-F800-49C1-9451-A690458BDE3D}.Debug|Win32.Build.0 = Debug|Win32 {0FFF4160-F800-49C1-9451-A690458BDE3D}.Release|Win32.ActiveCfg = Release|Win32 {0FFF4160-F800-49C1-9451-A690458BDE3D}.Release|Win32.Build.0 = Release|Win32 + {9F3EC1F7-7AB1-495F-9151-966C6F12DB48}.Debug|Win32.ActiveCfg = Debug|Win32 + {9F3EC1F7-7AB1-495F-9151-966C6F12DB48}.Debug|Win32.Build.0 = Debug|Win32 + {9F3EC1F7-7AB1-495F-9151-966C6F12DB48}.Release|Win32.ActiveCfg = Release|Win32 + {9F3EC1F7-7AB1-495F-9151-966C6F12DB48}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Index: squid3/port/win32/cachemgr/cachemgr.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/cachemgr/Attic/cachemgr.vcproj,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- squid3/port/win32/cachemgr/cachemgr.vcproj 1 Jul 2008 12:22:16 -0000 1.1.2.4 +++ squid3/port/win32/cachemgr/cachemgr.vcproj 22 Aug 2009 16:38:24 -0000 1.1.2.5 @@ -42,7 +42,7 @@ header file. */ +/* #undef HAVE_LINUX_TYPES_H */ + /* long is defined in system headers */ #define HAVE_LONG 1 /* long long is defined in system headers */ -/* #undef HAVE_LONG_LONG */ +#define HAVE_LONG_LONG 1 /* Define to 1 if you have the `lrand48' function. */ /* #undef HAVE_LRAND48 */ @@ -470,7 +473,7 @@ /* #undef HAVE_PATHS_H */ /* pid_t is defined by the system headers */ -#define HAVE_PID_T 1 +// #define HAVE_PID_T 1 /* Define to 1 if you have the `poll' function. */ /* #undef HAVE_POLL */ @@ -621,7 +624,7 @@ #define HAVE_STDEXCEPT 1 /* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 +/* #undef HAVE_STDINT_H */ /* Define to 1 if you have the header file. */ #define HAVE_STDIO_H 1 @@ -768,16 +771,16 @@ #define HAVE_TIME_H 1 /* uint16_t is defined in system headers */ -#define HAVE_UINT16_T 1 +/* #undef HAVE_UINT16_T */ /* uint32_t is defined in system headers */ -#define HAVE_UINT32_T 1 +/* #undef HAVE_UINT32_T */ /* uint64_t is defined in system headers */ -#define HAVE_UINT64_T 1 +/* #undef HAVE_UINT64_T */ /* uint8_t is defined in system headers */ -#define HAVE_UINT8_T 1 +/* #undef HAVE_UINT8_T */ /* Define to 1 if you have the header file. */ /* #undef HAVE_UNISTD_H */ @@ -860,6 +863,9 @@ with caution. */ /* #undef KILL_PARENT_OPT */ +/* if libcap2 is available and not clashing with libc */ +#define LIBCAP_BROKEN 1 + /* If libresolv.a has been hacked to export _dns_ttl_ */ /* #undef LIBRESOLV_DNS_TTL_HACK */ @@ -951,10 +957,10 @@ #define SIZEOF___INT64 8 /* UDP receive buffer size */ -#define SQUID_DETECT_UDP_SO_RCVBUF 16384 +#define SQUID_DETECT_UDP_SO_RCVBUF 8192 /* UDP send buffer size */ -#define SQUID_DETECT_UDP_SO_SNDBUF 16384 +#define SQUID_DETECT_UDP_SO_SNDBUF 8192 /* Maximum number of open filedescriptors */ #define SQUID_MAXFD 2048 @@ -963,10 +969,10 @@ #define SQUID_SNMP 1 /* TCP receive buffer size */ -#define SQUID_TCP_SO_RCVBUF 16384 +#define SQUID_TCP_SO_RCVBUF 8192 /* TCP send buffer size */ -#define SQUID_TCP_SO_SNDBUF 16384 +#define SQUID_TCP_SO_SNDBUF 8192 /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be Index: squid3/port/win32/libcc/libcc.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libcc/Attic/libcc.vcproj,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/port/win32/libcc/libcc.vcproj 20 Jan 2008 20:44:00 -0000 1.1.2.3 +++ squid3/port/win32/libcc/libcc.vcproj 22 Aug 2009 16:38:24 -0000 1.1.2.4 @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../../../lib/libtrie/include,../../../include,../../../src,../include" + AdditionalIncludeDirectories="../../../;../../../lib/libtrie/include;../../../include;../../../src;../include" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="0" @@ -115,7 +115,7 @@ - - @@ -196,10 +192,6 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > - - Index: squid3/port/win32/libicap/libicap.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libicap/Attic/libicap.vcproj,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- squid3/port/win32/libicap/libicap.vcproj 14 Aug 2007 09:40:17 -0000 1.1.2.3 +++ squid3/port/win32/libicap/libicap.vcproj 22 Aug 2009 16:38:24 -0000 1.1.2.4 @@ -41,7 +41,7 @@ - - - - - - @@ -215,63 +203,51 @@ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" > - - - - - - Index: squid3/port/win32/libmiscutil/libmiscutil.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libmiscutil/Attic/libmiscutil.vcproj,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -u -r1.1.2.11 -r1.1.2.12 --- squid3/port/win32/libmiscutil/libmiscutil.vcproj 1 Jul 2008 12:22:16 -0000 1.1.2.11 +++ squid3/port/win32/libmiscutil/libmiscutil.vcproj 22 Aug 2009 16:38:24 -0000 1.1.2.12 @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../../../include,../include,../../../src" + AdditionalIncludeDirectories="../../../;../../../include;../include;../../../src" PreprocessorDefinitions="NDEBUG;WIN32;_LIB;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="0" @@ -54,6 +54,7 @@ ProgramDataBaseFileName=".\Release/" WarningLevel="3" SuppressStartupBanner="true" + CompileAs="1" /> - - + + @@ -668,6 +670,14 @@ Filter="h;hpp;hxx;hm;inl" > + + + + @@ -684,6 +694,10 @@ > + + Index: squid3/port/win32/libntlm/libntlm.vcproj =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libntlm/Attic/libntlm.vcproj,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- squid3/port/win32/libntlm/libntlm.vcproj 1 Jan 2005 11:14:55 -0000 1.1.2.2 +++ squid3/port/win32/libntlm/libntlm.vcproj 22 Aug 2009 16:38:24 -0000 1.1.2.3 @@ -19,7 +19,7 @@ IntermediateDirectory=".\Debug" ConfigurationType="4" UseOfMFC="0" - ATLMinimizesCRunTimeLibraryUsage="FALSE" + ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" > @@ -1133,10 +1133,6 @@ > - -