--------------------- PatchSet 666 Date: 2003/03/15 11:11:46 Author: serassio Branch: nt Tag: (none) Log: Added a windows.h wrapper for Windows objects conflicts handling Members: include/squid_windows.h:1.1->1.1.2.1 lib/Makefile.am:1.6.2.3->1.6.2.4 lib/win32lib.c:1.2.18.1->1.2.18.2 src/dns_internal.cc:1.7.2.4->1.7.2.5 src/main.cc:1.15.2.3->1.15.2.4 src/fs/awin32/aiops.cc:1.2.18.1->1.2.18.2 --- /dev/null Wed Feb 14 12:16:11 2007 +++ squid3/include/squid_windows.h Wed Feb 14 12:16:31 2007 @@ -0,0 +1,42 @@ +/* + * $Id: squid_windows.h,v 1.1.2.1 2003/03/15 11:12:58 serassio Exp $ + * + * AUTHOR: Guido Serassio + * + * SQUID Web Proxy Cache http://www.squid-cache.org/ + * ---------------------------------------------------------- + * + * Squid is the result of efforts by numerous individuals from + * the Internet community; see the CONTRIBUTORS file for full + * details. Many organizations have provided support for Squid's + * development; see the SPONSORS file for full details. Squid is + * Copyrighted (C) 2001 by the Regents of the University of + * California; see the COPYRIGHT file for full details. Squid + * incorporates software developed and/or copyrighted by other + * sources; see the CREDITS file for full details. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * + */ + +#ifndef ACL +#define ACL WindowsACL +#define _MSWIN_ACL_WAS_NOT_DEFINED 1 +#endif +#include +#if _MSWIN_ACL_WAS_NOT_DEFINED +#undef ACL +#undef _MSWIN_ACL_WAS_NOT_DEFINED +#endif Index: squid3/lib/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/Makefile.am,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -r1.6.2.3 -r1.6.2.4 --- squid3/lib/Makefile.am 11 Mar 2003 08:26:48 -0000 1.6.2.3 +++ squid3/lib/Makefile.am 15 Mar 2003 11:12:38 -0000 1.6.2.4 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.6.2.3 2003/03/11 08:26:48 serassio Exp $ +# $Id: Makefile.am,v 1.6.2.4 2003/03/15 11:12:38 serassio Exp $ # SUBDIRS = libTrie @@ -50,8 +50,8 @@ md5.c \ Profiler.c \ snprintf.c \ - drand48.c \ - getopt.c \ +# drand48.c \ +# getopt.c \ win32lib.c libmiscutil_a_SOURCES = \ MemPool.c \ Index: squid3/lib/win32lib.c =================================================================== RCS file: /cvsroot/squid-sf//squid3/lib/win32lib.c,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/lib/win32lib.c 25 Feb 2003 02:48:33 -0000 1.2.18.1 +++ squid3/lib/win32lib.c 15 Mar 2003 11:12:38 -0000 1.2.18.2 @@ -1,5 +1,5 @@ /* - * $Id: win32lib.c,v 1.2.18.1 2003/02/25 02:48:33 hno Exp $ + * $Id: win32lib.c,v 1.2.18.2 2003/03/15 11:12:38 serassio Exp $ * * * * * * * * * Legal stuff * * * * * * * * @@ -47,7 +47,7 @@ #include #include #include -#include +#include "squid_windows.h" #include #include Index: squid3/src/dns_internal.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/dns_internal.cc,v retrieving revision 1.7.2.4 retrieving revision 1.7.2.5 diff -u -r1.7.2.4 -r1.7.2.5 --- squid3/src/dns_internal.cc 8 Mar 2003 20:25:08 -0000 1.7.2.4 +++ squid3/src/dns_internal.cc 15 Mar 2003 11:11:46 -0000 1.7.2.5 @@ -1,6 +1,6 @@ /* - * $Id: dns_internal.cc,v 1.7.2.4 2003/03/08 20:25:08 serassio Exp $ + * $Id: dns_internal.cc,v 1.7.2.5 2003/03/15 11:11:46 serassio Exp $ * * DEBUG: section 78 DNS lookups; interacts with lib/rfc1035.c * AUTHOR: Duane Wessels @@ -43,7 +43,7 @@ */ #ifndef USE_DNSSERVERS #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) -#include +#include "squid_windows.h" #endif #ifndef _PATH_RESOLV_CONF #define _PATH_RESOLV_CONF "/etc/resolv.conf" Index: squid3/src/main.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/main.cc,v retrieving revision 1.15.2.3 retrieving revision 1.15.2.4 diff -u -r1.15.2.3 -r1.15.2.4 --- squid3/src/main.cc 8 Mar 2003 20:25:08 -0000 1.15.2.3 +++ squid3/src/main.cc 15 Mar 2003 11:12:05 -0000 1.15.2.4 @@ -1,6 +1,6 @@ /* - * $Id: main.cc,v 1.15.2.3 2003/03/08 20:25:08 serassio Exp $ + * $Id: main.cc,v 1.15.2.4 2003/03/15 11:12:05 serassio Exp $ * * DEBUG: section 1 Startup and Main Loop * AUTHOR: Harvest Derived @@ -43,7 +43,7 @@ #include "ACL.h" #if defined(USE_WIN32_SERVICE) && (defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_)) -#include +#include "squid_windows.h" #include static int opt_install_service = FALSE; static int opt_remove_service = FALSE; Index: squid3/src/fs/awin32/aiops.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/awin32/Attic/aiops.cc,v retrieving revision 1.2.18.1 retrieving revision 1.2.18.2 diff -u -r1.2.18.1 -r1.2.18.2 --- squid3/src/fs/awin32/aiops.cc 25 Feb 2003 02:49:21 -0000 1.2.18.1 +++ squid3/src/fs/awin32/aiops.cc 15 Mar 2003 11:12:10 -0000 1.2.18.2 @@ -1,5 +1,5 @@ /* - * $Id: aiops.cc,v 1.2.18.1 2003/02/25 02:49:21 hno Exp $ + * $Id: aiops.cc,v 1.2.18.2 2003/03/15 11:12:10 serassio Exp $ * * DEBUG: section 43 AIOPS * AUTHOR: Stewart Forster @@ -34,7 +34,7 @@ #include "squid.h" #include "Store.h" -#include +#include "squid_windows.h" #include "store_asyncufs.h" #include