--------------------- PatchSet 856 Date: 2003/08/09 07:34:16 Author: serassio Branch: nt Tag: (none) Log: Update MSVC++ Project files Members: port/win32/squid.dsw:1.2.18.3->1.2.18.4 port/win32/NCSA_auth/NCSA_auth.dsp:1.2.18.1->1.2.18.2 port/win32/include/autoconf.h:1.2.18.5->1.2.18.6 port/win32/include/squid-mswin.h:1.3.18.4->1.3.18.5 port/win32/libawin32/libawin32.dsp:1.2.18.1->1.2.18.2 port/win32/libcc/libcc.dsp:1.1.2.1->1.1.2.2 port/win32/squid/squid.dsp:1.2.18.5->1.2.18.6 Index: squid3/port/win32/squid.dsw =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/Attic/squid.dsw,v retrieving revision 1.2.18.3 retrieving revision 1.2.18.4 diff -u -r1.2.18.3 -r1.2.18.4 --- squid3/port/win32/squid.dsw 15 Jul 2003 18:28:21 -0000 1.2.18.3 +++ squid3/port/win32/squid.dsw 9 Aug 2003 07:34:16 -0000 1.2.18.4 @@ -57,6 +57,21 @@ ############################################################################### +Project: "VirtualDeleteOperator"=".\VirtualDeleteOperator\VirtualDeleteOperator.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libmiscutil + End Project Dependency +}}} + +############################################################################### + Project: "cachemgr"=".\cachemgr\cachemgr.dsp" - Package Owner=<4> Package=<5> @@ -227,9 +242,6 @@ Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name modules - End Project Dependency }}} ############################################################################### @@ -404,9 +416,6 @@ Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name modules - End Project Dependency }}} ############################################################################### @@ -458,9 +467,6 @@ Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name modules - End Project Dependency }}} ############################################################################### @@ -573,28 +579,28 @@ Project_Dep_Name libntlm End Project Dependency Begin Project Dependency - Project_Dep_Name libufs + Project_Dep_Name libheap End Project Dependency Begin Project Dependency - Project_Dep_Name libheap + Project_Dep_Name libnull End Project Dependency Begin Project Dependency - Project_Dep_Name libawin32 + Project_Dep_Name libc End Project Dependency Begin Project Dependency - Project_Dep_Name libnull + Project_Dep_Name libcc End Project Dependency Begin Project Dependency Project_Dep_Name libdigest End Project Dependency Begin Project Dependency - Project_Dep_Name libcoss + Project_Dep_Name libawin32 End Project Dependency Begin Project Dependency - Project_Dep_Name libc + Project_Dep_Name libtrie End Project Dependency Begin Project Dependency - Project_Dep_Name libcc + Project_Dep_Name libufs End Project Dependency }}} Index: squid3/port/win32/NCSA_auth/NCSA_auth.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/NCSA_auth/Attic/NCSA_auth.dsp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/NCSA_auth/NCSA_auth.dsp 25 Feb 2003 02:48:40 -0000 1.2.18.1 +++ squid3/port/win32/NCSA_auth/NCSA_auth.dsp 9 Aug 2003 07:34:17 -0000 1.2.18.2 @@ -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 ws2_32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 ws2_32.lib libeay32.lib /nologo /subsystem:console /machine:I386 !ELSEIF "$(CFG)" == "NCSA_auth - 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 ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ws2_32.lib libeay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept !ENDIF @@ -87,6 +87,10 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File +SOURCE=..\..\..\helpers\basic_auth\NCSA\crypt_md5.c +# End Source File +# Begin Source File + SOURCE=..\src\encrypt.c # End Source File # Begin Source File Index: squid3/port/win32/include/autoconf.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/autoconf.h,v retrieving revision 1.2.18.5 retrieving revision 1.2.18.6 diff -u -r1.2.18.5 -r1.2.18.6 --- squid3/port/win32/include/autoconf.h 3 Aug 2003 18:34:00 -0000 1.2.18.5 +++ squid3/port/win32/include/autoconf.h 9 Aug 2003 07:34:17 -0000 1.2.18.6 @@ -443,7 +443,7 @@ /* #undef HAVE_SOCKETPAIR */ /* socklen_t is defined by the system headers */ -/* #undef HAVE_SOCKLEN_T */ +#define HAVE_SOCKLEN_T 1 /* Define to 1 if you have the `srand48' function. */ /* #undef HAVE_SRAND48 */ Index: squid3/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/include/Attic/squid-mswin.h,v retrieving revision 1.3.18.4 retrieving revision 1.3.18.5 diff -u -r1.3.18.4 -r1.3.18.5 --- squid3/port/win32/include/squid-mswin.h 13 Jul 2003 12:58:10 -0000 1.3.18.4 +++ squid3/port/win32/include/squid-mswin.h 9 Aug 2003 07:34:17 -0000 1.3.18.5 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.3.18.4 2003/07/13 12:58:10 serassio Exp $ + * $Id: squid-mswin.h,v 1.3.18.5 2003/08/09 07:34:17 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -51,6 +51,8 @@ typedef long off_t; typedef int ssize_t; +typedef int socklen_t; + #include "default_config_file.h" /* Some tricks for MS Compilers */ #define __STDC__ 1 @@ -338,7 +340,7 @@ namespace Squid { inline -int accept(int s, struct sockaddr FAR * a, int FAR * l) +int accept(int s, struct sockaddr * a, int * l) { SOCKET result; if ((result = ::accept(_get_osfhandle(s), a, l)) == INVALID_SOCKET) { @@ -349,7 +351,6 @@ else return _open_osfhandle(result, 0); } -#define accept(s,a,l) Squid::accept(s,a,l) inline int bind(int s, struct sockaddr * n, int l) @@ -361,7 +362,6 @@ else return 0; } -#define bind(s,n,l) Squid::bind(s,n,l) inline int connect(int s, const struct sockaddr * n, int l) @@ -376,7 +376,7 @@ } inline -HOSTENT FAR * gethostbyname (const char *n) +struct hostent * gethostbyname (const char *n) { HOSTENT FAR * result; if ((result = ::gethostbyname(n)) == NULL) @@ -490,10 +490,9 @@ else return result; } -#define recv(s,b,l,f) Squid::recv(s,b,l,f) inline -int recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, int FAR * fl) +int recvfrom(int s, void * b, size_t l, int f, struct sockaddr * fr, socklen_t * fl) { int result; if ((result = ::recvfrom(_get_osfhandle(s), (char *)b, l, f, fr, fl)) == SOCKET_ERROR) { @@ -503,7 +502,7 @@ else return result; } -#define recvfrom(s,b,l,f,fr,fl) Squid::recvfrom(s,b,l,f,fr,fl) +// #define recvfrom(s,b,l,f,fr,fl) Squid::recvfrom(s,b,l,f,fr,fl) inline int select(int n, fd_set * r, fd_set * w, fd_set * e, struct timeval * t) @@ -529,7 +528,6 @@ else return result; } -#define send(s,b,l,f) Squid::send(s,b,l,f) inline int sendto(int s, const void * b, size_t l, int f, const struct sockaddr * t, int tl) @@ -542,7 +540,6 @@ else return result; } -#define sendto(s,b,l,f,t,tl) Squid::sendto(s,b,l,f,t,tl) inline int setsockopt(SOCKET s, int l, int o, const void * v, int n) @@ -565,7 +562,6 @@ else return 0; } -#define shutdown(s,h) Squid::shutdown(s,h) inline int socket(int f, int t, int p) @@ -675,4 +671,5 @@ long ru_nvcsw; /* voluntary context switches */ long ru_nivcsw; /* involuntary context switches */ }; + #undef ACL Index: squid3/port/win32/libawin32/libawin32.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libawin32/Attic/libawin32.dsp,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/port/win32/libawin32/libawin32.dsp 25 Feb 2003 02:48:48 -0000 1.2.18.1 +++ squid3/port/win32/libawin32/libawin32.dsp 9 Aug 2003 07:34:17 -0000 1.2.18.2 @@ -93,11 +93,11 @@ # End Source File # Begin Source File -SOURCE=..\..\..\src\fs\awin32\store_dir_aufs.cc +SOURCE=..\..\..\src\fs\awin32\store_io_aufs.cc # End Source File # Begin Source File -SOURCE=..\..\..\src\fs\awin32\store_io_aufs.cc +SOURCE=..\..\..\src\fs\awin32\StoreFSawin32.cc # End Source File # End Group # Begin Group "Header Files" Index: squid3/port/win32/libcc/libcc.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/libcc/Attic/libcc.dsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid3/port/win32/libcc/libcc.dsp 1 May 2003 23:03:43 -0000 1.1.2.1 +++ squid3/port/win32/libcc/libcc.dsp 9 Aug 2003 07:34:17 -0000 1.1.2.2 @@ -63,7 +63,7 @@ # 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 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 "../../../lib/libtrie/include" /I "../../../include" /I "../../../src" /I "../include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /TP /c # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x410 /d "_DEBUG" @@ -85,10 +85,6 @@ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\..\lib\Array.cc -# End Source File -# Begin Source File - SOURCE=..\..\..\lib\Splay.cc # End Source File # Begin Source File Index: squid3/port/win32/squid/squid.dsp =================================================================== RCS file: /cvsroot/squid-sf//squid3/port/win32/squid/Attic/squid.dsp,v retrieving revision 1.2.18.5 retrieving revision 1.2.18.6 diff -u -r1.2.18.5 -r1.2.18.6 --- squid3/port/win32/squid/squid.dsp 15 Jul 2003 21:27:01 -0000 1.2.18.5 +++ squid3/port/win32/squid/squid.dsp 9 Aug 2003 07:34:17 -0000 1.2.18.6 @@ -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 ws2_32.lib advapi32.lib psapi.lib ssleay32.lib RSAglue.lib libeay32.lib LIBCMT.LIB gdi32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 LIBCMT.LIB ws2_32.lib advapi32.lib psapi.lib ssleay32.lib libeay32.lib gdi32.lib libexpat.lib /nologo /subsystem:console /machine:I386 # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "squid - 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 iphlpapi.lib ws2_32.lib advapi32.lib psapi.lib ssleay32.lib RSAglue.lib libeay32.lib gdi32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"LIBCMT" /pdbtype:sept +# ADD LINK32 iphlpapi.lib ws2_32.lib advapi32.lib psapi.lib ssleay32.lib libeay32.lib gdi32.lib libexpat.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"LIBCMT" /pdbtype:sept # SUBTRACT LINK32 /pdb:none !ENDIF @@ -292,10 +292,6 @@ # End Source File # Begin Source File -SOURCE=..\..\..\src\ESIExcept.h -# End Source File -# Begin Source File - SOURCE=..\..\..\src\ESIExpatParser.cc # End Source File # Begin Source File @@ -393,18 +389,6 @@ # End Source File # Begin Source File -SOURCE=..\..\..\src\comm_epoll.cc -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\comm_kqueue.cc -# End Source File -# Begin Source File - -SOURCE=..\..\..\src\comm_poll.cc -# End Source File -# Begin Source File - SOURCE=..\..\..\src\comm_select.cc # End Source File # Begin Source File @@ -589,6 +573,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\mem_node.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\MemBuf.cc # End Source File # Begin Source File @@ -705,10 +693,6 @@ # End Source File # Begin Source File -SOURCE=..\..\..\src\store_modules.cc -# End Source File -# Begin Source File - SOURCE=..\..\..\src\store_rebuild.cc # End Source File # Begin Source File @@ -725,6 +709,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\StoreFileSystem.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\StoreIOState.cc # End Source File # Begin Source File @@ -753,6 +741,10 @@ # End Source File # Begin Source File +SOURCE=..\..\..\src\StoreSwapLogData.cc +# End Source File +# Begin Source File + SOURCE=..\..\..\src\String.cc # End Source File # Begin Source File