---------------------
PatchSet 3756 
Date: 2002/03/23 10:51:55
Author: serassio
Branch: nt-2_5
Tag: (none) 
Log:
Added more WIN32 stuff

Members: 
	port/win32/include/win32-autoconf.h:1.1.2.1->1.1.2.2(DEAD) 
	src/client.c:1.8.14.2->1.8.14.3 
	src/debug.c:1.9.10.2->1.9.10.3 
	src/fd.c:1.7.16.2->1.7.16.3 
	src/unlinkd.c:1.6.10.1->1.6.10.2 

--- squid/port/win32/include/win32-autoconf.h	Wed Feb 14 00:57:31 2007
+++ /dev/null	Wed Feb 14 00:55:47 2007
@@ -1,942 +0,0 @@
-/* include/autoconf.h.  Generated automatically by configure.  */
-/* include/autoconf.h.in.  Generated automatically from configure.in by autoheader.  */
-/*
- * All configurable options are enabled by using --enable-....
- * when running configure. See configure --help for a list
- * of all available options.
- *
- * You are free to edit this file, but it will be overwritten
- * each time you run configure. You may need to edit this file
- * if configure falsely picks up a library function or structure
- * that doesn't really work on your system.
- *
- * Another way to block a function that should not be detected
- * is to
- * setenv ac_cv_func_<functionname> no
- * before running configure, as in
- * setenv ac_cv_func_setresuid no
- *
- * It is possible to enable some of the configurable options
- * by editing this file alone, but some of them requires changes
- * in the Makefiles, wich is done automatically by configure.
- *
- */
-
-/* $Id: win32-autoconf.h,v 1.1.2.1 2002/03/16 17:54:33 serassio Exp $ */
-
-/*
- * configure command line used to configure Squid
- */
-
-#undef SQUID_CONFIGURE_OPTIONS
-#define SQUID_CONFIGURE_OPTIONS "--disable-wccp --enable-underscores --enable-snmp --enable-win32-service --enable-useragent-log '--enable-auth=basic ntlm' --enable-basic-auth-helpers=win32_locallogon --enable-ntlm-auth-helpers=NTLMSSP --prefix=c:/squid --enable-delay-pools"
-
-/*********************************
- * START OF CONFIGURABLE OPTIONS *
- *********************************/
-/*
- * If you are upset that the cachemgr.cgi form comes up with the hostname
- * field blank, then define this to getfullhostname()
- */
-#undef CACHEMGR_HOSTNAME 
-
-/*
- * What default TCP port to use for HTTP listening?
- */
-#ifndef CACHE_HTTP_PORT
-#define CACHE_HTTP_PORT 3128
-#endif
-
-/*
- * What default UDP port to use for ICP listening?
- */
-#ifndef CACHE_ICP_PORT
-#define CACHE_ICP_PORT 3130
-#endif
-
-/* Define to do simple malloc debugging */
-#undef XMALLOC_DEBUG 
-
-/* Define for log file trace of mem alloc/free */
-#undef MEM_GEN_TRACE 
-
-/* Define to have malloc statistics */
-#undef XMALLOC_STATISTICS 
-
-/* Define to have a detailed trace of memory allocations */
-#undef XMALLOC_TRACE 
-
-#undef FORW_VIA_DB 
-
-/* Defines how many threads aufs uses for I/O */
-#undef AUFS_IO_THREADS 
-#define AUFS_IO_THREADS 16
-
-/*
- * If you want to use Squid's ICMP features (highly recommended!) then
- * define this.  When USE_ICMP is defined, Squid will send ICMP pings
- * to origin server sites.  This information is used in numerous ways:
- *         - Sent in ICP replies so neighbor caches know how close
- *           you are to the source.
- *         - For finding the closest instance of a URN.
- *         - With the 'test_reachability' option.  Squid will return
- *           ICP_OP_MISS_NOFETCH for sites which it cannot ping.
- */
-#undef USE_ICMP 
-
-/*
- * Traffic management via "delay pools".
- */
-#undef DELAY_POOLS
-#define DELAY_POOLS 1
-
-/*
- * If you want to log User-Agent request header values, define this.
- * By default, they are written to useragent.log in the Squid log
- * directory.
- */
-#undef USE_USERAGENT_LOG
-#define USE_USERAGENT_LOG 1
-
-/*
- * If you want to log Referer request header values, define this.
- * By default, they are written to referer.log in the Squid log
- * directory.
- */
-#undef USE_REFERER_LOG 
-
-/*
- * A dangerous feature which causes Squid to kill its parent process
- * (presumably the RunCache script) upon receipt of SIGTERM or SIGINT.
- * Use with caution.
- */
-#undef KILL_PARENT_OPT 
-
-/* Define to enable SNMP monitoring of Squid */
-#undef SQUID_SNMP
-#define SQUID_SNMP 1
-
-/*
- * Define to enable WCCP
- */
-#undef USE_WCCP
-#define USE_WCCP 0
-
-/*
- * Squid frequently calls gettimeofday() for accurate timestamping.
- * If you are concerned that gettimeofday() is called too often, and
- * could be causing performance degradation, then you can define
- * ALARM_UPDATES_TIME and cause Squid's clock to be updated at regular
- * intervals (one second) with ALARM signals.
- */
-#undef ALARM_UPDATES_TIME 
-
-/*
- * Define this to include code which lets you specify access control
- * elements based on ethernet hardware addresses.  This code uses
- * functions found in 4.4 BSD derviations (e.g. FreeBSD, ?).
- */
-#undef USE_ARP_ACL 
-
-/*
- * Define this to include code for the Hypertext Cache Protocol (HTCP)
- */
-#undef USE_HTCP
-#define USE_HTCP 1
-
-/*
- * Use Cache Digests for locating objects in neighbor caches.  This
- * code is still semi-experimental.
- */
-#undef USE_CACHE_DIGESTS 
-
-/*
- * Cache Array Routing Protocol
- */
-#undef USE_CARP 
-
-/* Define if NTLM is allowed to fail gracefully when a helper has problems */
-#undef NTLM_FAIL_OPEN 
-
-/*
- * Define Windows NT & Windows 2000 run service mode
- */
-#define USE_WIN32_SERVICE 1
-
-/********************************
- *  END OF CONFIGURABLE OPTIONS *
- ********************************/
-
-/* Define if struct tm has tm_gmtoff member */
-#undef HAVE_TM_GMTOFF 
-
-/* Define if struct mallinfo has mxfast member */
-#undef HAVE_EXT_MALLINFO 
-
-/* Default FD_SETSIZE value */
-#undef DEFAULT_FD_SETSIZE
-#define DEFAULT_FD_SETSIZE 64
-
-/* Maximum number of open filedescriptors */
-#undef SQUID_MAXFD
-#define SQUID_MAXFD 8192
-
-/* UDP send buffer size */
-#undef SQUID_UDP_SO_SNDBUF
-#define SQUID_UDP_SO_SNDBUF 8192
-
-/* UDP receive buffer size */
-#undef SQUID_UDP_SO_RCVBUF
-#define SQUID_UDP_SO_RCVBUF 8192
-
-/* TCP send buffer size */
-#undef SQUID_TCP_SO_SNDBUF
-#define SQUID_TCP_SO_SNDBUF 8192
-
-/* TCP receive buffer size */
-#undef SQUID_TCP_SO_RCVBUF
-#define SQUID_TCP_SO_RCVBUF 8192
-
-/* Host type from configure */
-#undef CONFIG_HOST_TYPE
-#define CONFIG_HOST_TYPE "i686-pc-winnt"
-
-/* If we need to declare sys_errlist[] as external */
-#undef NEED_SYS_ERRLIST
-
-/* If gettimeofday is known to take only one argument */
-#undef GETTIMEOFDAY_NO_TZP 
-
-/* If libresolv.a has been hacked to export _dns_ttl_ */
-#undef LIBRESOLV_DNS_TTL_HACK 
-
-/* Define if struct ip has ip_hl member */
-#undef HAVE_IP_HL 
-
-/* Define if your compiler supports prototyping */
-#undef HAVE_ANSI_PROTOTYPES
-
-/* Define if we should use GNU regex */
-#undef USE_GNUREGEX
-#define USE_GNUREGEX 1
-
-/* signed size_t, grr */
-#undef ssize_t 
-#define ssize_t int
-
-/*
- * Yay! Another Linux brokenness.  Its not good enough to know that
- * setresuid() exists, because RedHat 5.0 declare setresuid() but
- * doesn't implement it.
- */
-#undef HAVE_SETRESUID 
-
-/* Define if you have struct rusage */
-#define HAVE_STRUCT_RUSAGE 1
-
-/* Define if you have PSAPI.DLL on Windows systems */
-#undef HAVE_WIN32_PSAPI
-#define HAVE_WIN32_PSAPI 1
-
-/*
- * This makes warnings go away.  If you have socklen_t defined in your
- * /usr/include files, then this should remain undef'd.  Otherwise it
- * should be defined to int.
- */
-#undef socklen_t
-#define socklen_t int
-
-/*
- * By default (for now anyway) Squid includes options which allows
- * the cache administrator to violate the HTTP protocol specification
- * in terms of cache behaviour.  Setting this to '0' will disable
- * such code.
- */
-#define HTTP_VIOLATIONS 1
-
-/*
- * Enable support for Transparent Proxy on systems using IP-Filter
- * address redirection. This provides "masquerading" support for non
- *  Linux system.
- */
-#undef IPF_TRANSPARENT 
-
-/*
- * Enable code for assiting in finding memory leaks.  Hacker stuff only.
- */
-#undef USE_LEAKFINDER 
-
-/*
- * type of fd_set array
- */
-#undef fd_mask 
-#define fd_mask int 
-
-/*
- * If _res structure has nsaddr_list member
- */
-#undef HAVE_RES_NSADDR_LIST 
-
-/*
- * If _res structure has ns_list member
- */
-#undef HAVE_RES_NS_LIST 
-
-/*
- * Compile in support for Ident (RFC 931) lookups?  Enabled by default.
- */
-#undef USE_IDENT
-#define USE_IDENT 1
-
-/*
- * If your system has statvfs(), and if it actually works!
- */
-#undef HAVE_STATVFS
-
-/*
- * If --disable-internal-dns was given to configure, then we'll use
- * the dnsserver processes instead.
- */
-#undef USE_DNSSERVERS
-
-/*
- * we check for the existance of struct mallinfo
- */
-#undef HAVE_STRUCT_MALLINFO
-
-/*
- * Do we want to use truncate(2) or unlink(2)?
- */
-#undef USE_TRUNCATE
-
-/*
- * Allow underscores in host names
- */
-#undef ALLOW_HOSTNAME_UNDERSCORES
-#define ALLOW_HOSTNAME_UNDERSCORES 1
-
-/*
- * Use the heap-based replacement techniques
- */
-#undef HEAP_REPLACEMENT
-
-/*
- * message type for message queues
- */
-#define mtyp_t long
-
-/*
- * Define this to include code for SSL encryption.
- */
-#undef USE_SSL
-
-/*
- * Define this to make use of the OpenSSL libraries for
- * MD5 calculation rather than Squid's own MD5 implementation
- * or if building with SSL encryption (USE_SSL)
- */
-#undef USE_OPENSSL
-
-/* Define if you want to set the COSS membuf size */
-#undef COSS_MEMBUF_SZ
-
-/* Print stacktraces on fatal errors */
-#undef PRINT_STACK_TRACE
-
-/*
- * Define this if unlinkd is required
- * (strongly recommended for ufs storage type)
- */
-#undef USE_UNLINKD
-
-/*
- * Enable support for Transparent Proxy on Linux 2.4 systems
- */
-#undef LINUX_NETFILTER
-
-/*
- * Do we have unix sockets? (required for the winbind ntlm helper
- */
-#define HAVE_UNIXSOCKET 1
-
-/*
- * Known-size intgers
- */
-
-#undef int16_t
-typedef short int16_t;
-
-#undef u_int16_t
-typedef unsigned short u_int16_t;
-
-#undef int32_t
-typedef int int32_t;
-
-#undef u_int32_t
-typedef unsigned int u_int32_t;
-
-#undef int64_t
-typedef __int64 int64_t;
-
-#undef u_int64_t
-typedef unsigned __int64 u_int64_t;
-/*
- * Enable support for the X-Accelerator-Vary HTTP header
- */
-#undef X_ACCELERATOR_VARY
-
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-#undef CRAY_STACKSEG_END
-
-/* Define if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-#define HAVE_ALLOCA 1
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define if you have the <arpa/nameser.h> header file. */
-#undef HAVE_ARPA_NAMESER_H
-
-/* Define if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define if you have the `backtrace_symbols_fd' function. */
-#undef HAVE_BACKTRACE_SYMBOLS_FD
-
-/* Define if you have the `bcopy' function. */
-#undef HAVE_BCOPY
-
-/* Define if you have the <bstring.h> header file. */
-#undef HAVE_BSTRING_H
-
-/* Define if you have the `bswap_16' function. */
-#undef HAVE_BSWAP_16
-
-/* Define if you have the `bswap_32' function. */
-#undef HAVE_BSWAP_32
-
-/* Define if you have the <byteswap.h> header file. */
-#undef HAVE_BYTESWAP_H
-
-/* Define if you have the `crypt' function. */
-#undef HAVE_CRYPT
-#define HAVE_CRYPT 1
-
-/* Define if you have the <crypt.h> header file. */
-#undef HAVE_CRYPT_H
-#define HAVE_CRYPT_H 1
-
-/* Define if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-#define HAVE_CTYPE_H 1
-
-/* Define if you have the <dirent.h> header file, and it defines `DIR'. */
-#undef HAVE_DIRENT_H
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the `drand48' function. */
-#undef HAVE_DRAND48
-
-/* Define if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-#define HAVE_ERRNO_H 1
-
-/* Define if you have the <execinfo.h> header file. */
-#undef HAVE_EXECINFO_H
-
-/* Define if you have the `fchmod' function. */
-#undef HAVE_FCHMOD
-
-/* Define if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-#define HAVE_FCNTL_H 1
-
-/* Define if you have the `getdtablesize' function. */
-#define HAVE_GETDTABLESIZE 1
-
-/* Define if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-#define HAVE_GETOPT_H 1
-
-/* Define if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the `getrlimit' function. */
-#define HAVE_GETRLIMIT 1
-
-/* Define if you have the `getrusage' function. */
-#undef HAVE_GETRUSAGE
-#define HAVE_GETRUSAGE 1
-
-/* Define if you have the `getspnam' function. */
-#undef HAVE_GETSPNAM
-
-/* Define if you have the <glib.h> header file. */
-#undef HAVE_GLIB_H
-
-/* Define if you have the <gnumalloc.h> header file. */
-#undef HAVE_GNUMALLOC_H
-
-/* Define if you have the <grp.h> header file. */
-#undef HAVE_GRP_H
-
-/* Define if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have the <ip_compat.h> header file. */
-#undef HAVE_IP_COMPAT_H
-
-/* Define if you have the <ip_fil_compat.h> header file. */
-#undef HAVE_IP_FIL_COMPAT_H
-
-/* Define if you have the <ip_fil.h> header file. */
-#undef HAVE_IP_FIL_H
-
-/* Define if you have the <ip_nat.h> header file. */
-#undef HAVE_IP_NAT_H
-
-/* Define if you have the `44bsd' library (-l44bsd). */
-#undef HAVE_LIB44BSD
-
-/* Define if you have the `bind' library (-lbind). */
-#undef HAVE_LIBBIND
-
-/* Define if you have the `bsd' library (-lbsd). */
-#undef HAVE_LIBBSD
-
-/* Define if you have the <libc.h> header file. */
-#undef HAVE_LIBC_H
-
-/* Define if you have the `gnumalloc' library (-lgnumalloc). */
-#undef HAVE_LIBGNUMALLOC
-
-/* Define if you have the `intl' library (-lintl). */
-#undef HAVE_LIBINTL
-
-/* Define if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define if you have the `malloc' library (-lmalloc). */
-#undef HAVE_LIBMALLOC
-
-/* Define if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define if you have the `resolv' library (-lresolv). */
-#undef HAVE_LIBRESOLV
-
-/* Define if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if you have the <linux/netfilter_ipv4.h> header file. */
-#undef HAVE_LINUX_NETFILTER_IPV4_H
-
-/* Define if you have the `lrand48' function. */
-#undef HAVE_LRAND48
-
-/* Define if you have the `mallinfo' function. */
-/* #undef HAVE_MALLINFO */
-
-/* Define if you have the `mallocblksize' function. */
-/* #undef HAVE_MALLOCBLKSIZE */
-
-/* Define if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-#define HAVE_MALLOC_H 1
-
-/* Define if you have the `mallopt' function. */
-#undef HAVE_MALLOPT
-
-/* Define if you have the <math.h> header file. */
-#undef HAVE_MATH_H
-#define HAVE_MATH_H 1
-
-/* Define if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-#define HAVE_MEMCPY 1
-
-/* Define if you have the `memmove' function. */
-#undef HAVE_MEMMOVE
-#define HAVE_MEMMOVE 1
-
-/* Define if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-#define HAVE_MEMORY_H 1
-
-/* Define if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define if you have the `mktime' function. */
-#define HAVE_MKTIME 1
-
-/* Define if you have the <mount.h> header file. */
-#undef HAVE_MOUNT_H
-
-/* Define if you have the `mstats' function. */
-#undef HAVE_MSTATS
-
-/* Define if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <netdb.h> header file. */
-#undef HAVE_NETDB_H
-
-/* Define if you have the <netinet/if_ether.h> header file. */
-#undef HAVE_NETINET_IF_ETHER_H
-
-/* Define if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define if you have the <netinet/ip_compat.h> header file. */
-#undef HAVE_NETINET_IP_COMPAT_H
-
-/* Define if you have the <netinet/ip_fil_compat.h> header file. */
-#undef HAVE_NETINET_IP_FIL_COMPAT_H
-
-/* Define if you have the <netinet/ip_fil.h> header file. */
-#undef HAVE_NETINET_IP_FIL_H
-
-/* Define if you have the <netinet/ip_nat.h> header file. */
-#undef HAVE_NETINET_IP_NAT_H
-
-/* Define if you have the <netinet/tcp.h> header file. */
-#undef HAVE_NETINET_TCP_H
-
-/* Define if you have the <net/if.h> header file. */
-#undef HAVE_NET_IF_H
-
-/* Define if you have the <nss_common.h> header file. */
-#undef HAVE_NSS_COMMON_H
-
-/* Define if you have the <nss.h> header file. */
-#undef HAVE_NSS_H
-
-/* Define if you have the <openssl/err.h> header file. */
-#undef HAVE_OPENSSL_ERR_H
-
-/* Define if you have the <openssl/md5.h> header file. */
-#undef HAVE_OPENSSL_MD5_H
-
-/* Define if you have the <openssl/ssl.h> header file. */
-#undef HAVE_OPENSSL_SSL_H
-
-/* Define if you have the `poll' function. */
-#undef HAVE_POLL
-
-/* Define if you have the <poll.h> header file. */
-#undef HAVE_POLL_H
-
-/* Define if you have the `pthread_attr_setschedparam' function. */
-#define HAVE_PTHREAD_ATTR_SETSCHEDPARAM 1
-
-/* Define if you have the `pthread_attr_setscope' function. */
-#define HAVE_PTHREAD_ATTR_SETSCOPE 1
-
-/* Define if you have the `pthread_setschedparam' function. */
-#define HAVE_PTHREAD_SETSCHEDPARAM 1
-
-/* Define if you have the `pthread_sigmask' function. */
-#define HAVE_PTHREAD_SIGMASK 1
-
-/* Define if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define if you have the <pwd.h> header file. */
-#undef HAVE_PWD_H
-
-/* Define if you have the `random' function. */
-#undef HAVE_RANDOM
-
-/* Define if you have the `regcomp' function. */
-#define HAVE_REGCOMP 1
-
-/* Define if you have the `regexec' function. */
-#define HAVE_REGEXEC 1
-
-/* Define if you have the <regex.h> header file. */
-#undef HAVE_REGEX_H
-
-/* Define if you have the `regfree' function. */
-#define HAVE_REGFREE 1
-
-/* Define if you have the <resolv.h> header file. */
-#undef HAVE_RESOLV_H 
-
-/* Define if you have the `res_init' function. */
-#undef HAVE_RES_INIT
-
-/* Define if you have the `rint' function. */
-#undef HAVE_RINT
-
-/* Define if you have the <sched.h> header file. */
-#undef HAVE_SCHED_H
-
-/* Define if you have the `seteuid' function. */
-#undef HAVE_SETEUID
-
-/* Define if you have the `setgroups' function. */
-#undef HAVE_SETGROUPS
-
-/* Define if you have the `setpgrp' function. */
-#define HAVE_SETPGRP 1
-
-/* Define if you have the `setrlimit' function. */
-#undef HAVE_SETRLIMIT
-
-/* Define if you have the `setsid' function. */
-#define HAVE_SETSID 1
-
-/* Define if you have the `sigaction' function. */
-#undef HAVE_SIGACTION
-
-/* Define if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
-#define HAVE_SIGNAL_H 1
-
-/* Define if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define if you have the `srand48' function. */
-#define HAVE_SRAND48 1
-
-/* Define if you have the `srandom' function. */
-#undef HAVE_SRANDOM
-
-/* Define if you have the `statfs' function. */
-#define HAVE_STATFS 1
-
-/* Define if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define if you have the <syscall.h> header file. */
-#undef HAVE_SYSCALL_H
-
-/* Define if you have the `sysconf' function. */
-#define HAVE_SYSCONF 1
-
-/* Define if you have the `syslog' function. */
-#undef HAVE_SYSLOG
-
-/* Define if you have the <syslog.h> header file. */
-#undef HAVE_SYSLOG_H
-
-/* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/file.h> header file. */
-#undef HAVE_SYS_FILE_H
-
-/* Define if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define if you have the <sys/mount.h> header file. */
-#undef HAVE_SYS_MOUNT_H
-
-/* Define if you have the <sys/msg.h> header file. */
-#undef HAVE_SYS_MSG_H
-
-/* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/resource.h> header file. */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define if you have the <sys/select.h> header file. */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define if you have the <sys/statvfs.h> header file. */
-#undef HAVE_SYS_STATVFS_H
-
-/* Define if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define if you have the <sys/syscall.h> header file. */
-#undef HAVE_SYS_SYSCALL_H
-
-/* Define if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define if you have the <sys/un.h> header file. */
-#undef HAVE_SYS_UN_H
-
-/* Define if you have the <sys/vfs.h> header file. */
-#undef HAVE_SYS_VFS_H
-
-/* Define if you have the <sys/wait.h> header file. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have the `tempnam' function. */
-#define HAVE_TEMPNAM 1
-
-/* Define if you have the `timegm' function. */
-#undef HAVE_TIMEGM
-
-/* Define if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-#define HAVE_TIME_H 1
-
-/* Define if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <utime.h> header file. */
-#undef HAVE_UTIME_H
-
-/* Define if you have the <varargs.h> header file. */
-#undef HAVE_VARARGS_H
-#define HAVE_VARARGS_H 1
-
-/* Define if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
-/* Name of package */
-#define PACKAGE "squid"
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `int16_t', as computed by sizeof. */
-#define SIZEOF_INT16_T 2
-
-/* The size of a `int32_t', as computed by sizeof. */
-#define SIZEOF_INT32_T 4
-
-/* The size of a `int64_t', as computed by sizeof. */
-#define SIZEOF_INT64_T 8
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* The size of a `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* The size of a `uint16_t', as computed by sizeof. */
-#define SIZEOF_UINT16_T 0
-
-/* The size of a `uint32_t', as computed by sizeof. */
-#define SIZEOF_UINT32_T 0
-
-/* The size of a `uint64_t', as computed by sizeof. */
-#define SIZEOF_UINT64_T 0
-
-/* The size of a `u_int16_t', as computed by sizeof. */
-#define SIZEOF_U_INT16_T 2
-
-/* The size of a `u_int32_t', as computed by sizeof. */
-#define SIZEOF_U_INT32_T 4
-
-/* The size of a `u_int64_t', as computed by sizeof. */
-#define SIZEOF_U_INT64_T 8
-
-/* The size of a `void *', as computed by sizeof. */
-#define SIZEOF_VOID_P 4
-
-/* The size of a `__int64', as computed by sizeof. */
-#define SIZEOF___INT64 0
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "2.5.PRE4-CVS"
-
-/* Define if your processor stores words with the most significant byte first
-   (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef fd_mask */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef int16_t */
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef int32_t */
-
-/* Define to `unsigned __int64' if <sys/types.h> does not define. */
-/* #undef int64_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-#define pid_t long
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef u_int16_t */
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-/* #undef u_int32_t */
-
-/* Define to `unsigned long long' if <sys/types.h> does not define. */
-/* #undef u_int64_t */
-
Index: squid/src/client.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/client.c,v
retrieving revision 1.8.14.2
retrieving revision 1.8.14.3
diff -u -r1.8.14.2 -r1.8.14.3
--- squid/src/client.c	18 Mar 2002 22:33:48 -0000	1.8.14.2
+++ squid/src/client.c	23 Mar 2002 10:51:55 -0000	1.8.14.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client.c,v 1.8.14.2 2002/03/18 22:33:48 serassio Exp $
+ * $Id: client.c,v 1.8.14.3 2002/03/23 10:51:55 serassio Exp $
  *
  * DEBUG: section 0     WWW Client
  * AUTHOR: Harvest Derived
@@ -186,12 +186,12 @@
 		break;
 	    }
     }
-#ifdef _SQUID_MSWIN_
-    {
-	WSADATA wsaData;
-	WSAStartup(2, &wsaData);
-    }
-#endif
+#ifdef _SQUID_MSWIN_
+    {
+	WSADATA wsaData;
+	WSAStartup(2, &wsaData);
+    }
+#endif
     /* Build the HTTP request */
     if (strncmp(url, "mgr:", 4) == 0) {
 	char *t = xstrdup(url + 4);
@@ -285,11 +285,11 @@
 	    exit(1);
 	}
 	/* Send the HTTP request */
-#ifdef _SQUID_MSWIN_
-	bytesWritten = send(conn, msg, strlen(msg), 0);
-#else
+#ifdef _SQUID_MSWIN_
+	bytesWritten = send(conn, msg, strlen(msg), 0);
+#else
 	bytesWritten = mywrite(conn, msg, strlen(msg));
-#endif
+#endif
 	if (bytesWritten < 0) {
 	    perror("client: ERROR: write");
 	    exit(1);
@@ -300,12 +300,12 @@
 	if (put_file) {
 	    int x;
 	    lseek(put_fd, 0, SEEK_SET);
-#ifdef _SQUID_MSWIN_
-	    while ((x = read(put_fd, buf, sizeof(buf))) > 0) {
-		x = write(conn, buf, x);
-#else
-	    while ((x = myread(put_fd, buf, sizeof(buf))) > 0) {
-		x = mywrite(conn, buf, x);
+#ifdef _SQUID_MSWIN_
+	    while ((x = read(put_fd, buf, sizeof(buf))) > 0) {
+		x = write(conn, buf, x);
+#else
+	    while ((x = myread(put_fd, buf, sizeof(buf))) > 0) {
+		x = mywrite(conn, buf, x);
 #endif
 		total_bytes += x;
 		if (x <= 0)
@@ -316,19 +316,19 @@
 	}
 	/* Read the data */
 
-#ifdef _SQUID_MSWIN_
-	setmode(1, O_BINARY);
-	while ((len = recv(conn, buf, sizeof(buf), 0)) > 0) {
-#else
+#ifdef _SQUID_MSWIN_
+	setmode(1, O_BINARY);
+	while ((len = recv(conn, buf, sizeof(buf), 0)) > 0) {
+#else
 	while ((len = myread(conn, buf, sizeof(buf))) > 0) {
-#endif
+#endif
 	    fsize += len;
 	    if (to_stdout)
 		fwrite(buf, len, 1, stdout);
 	}
-#ifdef _SQUID_MSWIN_
-	setmode(1, O_TEXT);
-#endif
+#ifdef _SQUID_MSWIN_
+	setmode(1, O_TEXT);
+#endif
 	(void) close(conn);	/* done with socket */
 
 	if (interrupted)
@@ -456,7 +456,7 @@
     signal(SIGPIPE, pipe_handler);
 #endif
 
-}
+}
 
 #ifndef _SQUID_MSWIN_
 static ssize_t
Index: squid/src/debug.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/debug.c,v
retrieving revision 1.9.10.2
retrieving revision 1.9.10.3
diff -u -r1.9.10.2 -r1.9.10.3
--- squid/src/debug.c	17 Mar 2002 21:44:21 -0000	1.9.10.2
+++ squid/src/debug.c	23 Mar 2002 10:51:55 -0000	1.9.10.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.c,v 1.9.10.2 2002/03/17 21:44:21 serassio Exp $
+ * $Id: debug.c,v 1.9.10.3 2002/03/23 10:51:55 serassio Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -235,9 +235,9 @@
 	i--;
 	snprintf(from, MAXPATHLEN, "%s.%d", debug_log_file, i - 1);
 	snprintf(to, MAXPATHLEN, "%s.%d", debug_log_file, i);
-#ifdef _SQUID_MSWIN_
-	remove(to);
-#endif
+#ifdef _SQUID_MSWIN_
+	remove(to);
+#endif
 	rename(from, to);
     }
 /*
@@ -251,9 +251,9 @@
     /* Rotate the current log to .0 */
     if (Config.Log.rotateNumber > 0) {
 	snprintf(to, MAXPATHLEN, "%s.%d", debug_log_file, 0);
-#ifdef _SQUID_MSWIN_
-	remove(to);
-#endif
+#ifdef _SQUID_MSWIN_
+	remove(to);
+#endif
 	rename(debug_log_file, to);
     }
     /* Close and reopen the log.  It may have been renamed "manually"
Index: squid/src/fd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fd.c,v
retrieving revision 1.7.16.2
retrieving revision 1.7.16.3
diff -u -r1.7.16.2 -r1.7.16.3
--- squid/src/fd.c	17 Mar 2002 21:44:22 -0000	1.7.16.2
+++ squid/src/fd.c	23 Mar 2002 10:51:55 -0000	1.7.16.3
@@ -1,6 +1,6 @@
 
 /*
- * $Id: fd.c,v 1.7.16.2 2002/03/17 21:44:22 serassio Exp $
+ * $Id: fd.c,v 1.7.16.3 2002/03/23 10:51:55 serassio Exp $
  *
  * DEBUG: section 51    Filedescriptor Functions
  * AUTHOR: Duane Wessels
@@ -37,12 +37,12 @@
 
 int default_read_method(int, char *, int);
 int default_write_method(int, const char *, int);
-#ifdef _SQUID_MSWIN_
-int socket_read_method(int, char *, int);
-int socket_write_method(int, const char *, int);
-int file_read_method(int, char *, int);
-int file_write_method(int, const char *, int);
-#endif
+#ifdef _SQUID_MSWIN_
+int socket_read_method(int, char *, int);
+int socket_write_method(int, const char *, int);
+int file_read_method(int, char *, int);
+int file_write_method(int, const char *, int);
+#endif
 
 const char *fdTypeStr[] =
 {
@@ -98,32 +98,32 @@
     memset(F, '\0', sizeof(fde));
     F->timeout = 0;
 }
-
-
-#ifdef _SQUID_MSWIN_
-int
-socket_read_method(int fd, char *buf, int len)
-{
-    return (recv(fd, buf, len, 0));
-}
-
-int
-file_read_method(int fd, char *buf, int len)
-{
-    return (fread(buf, 1, len, fd_table[fd].fbuf));
-}
-
-int
-socket_write_method(int fd, const char *buf, int len)
-{
-    return (send(fd, buf, len, 0));
-}
-
-file_write_method(int fd, const char *buf, int len)
-{
-    return (fwrite(buf, 1, len, fd_table[fd].fbuf));
-}
-#endif
+
+
+#ifdef _SQUID_MSWIN_
+int
+socket_read_method(int fd, char *buf, int len)
+{
+    return (recv(fd, buf, len, 0));
+}
+
+int
+file_read_method(int fd, char *buf, int len)
+{
+    return (fread(buf, 1, len, fd_table[fd].fbuf));
+}
+
+int
+socket_write_method(int fd, const char *buf, int len)
+{
+    return (send(fd, buf, len, 0));
+}
+
+file_write_method(int fd, const char *buf, int len)
+{
+    return (fwrite(buf, 1, len, fd_table[fd].fbuf));
+}
+#endif
 
 int
 default_read_method(int fd, char *buf, int len)
@@ -134,7 +134,7 @@
 int
 default_write_method(int fd, const char *buf, int len)
 {
-    return (write(fd, buf, len));
+    return (write(fd, buf, len));
 }
 
 void
@@ -150,26 +150,26 @@
     assert(!F->flags.open);
     debug(51, 3) ("fd_open FD %d %s\n", fd, desc);
     F->type = type;
-    F->flags.open = 1;
-#ifdef _SQUID_MSWIN_
-    switch (type) {
-    case FD_SOCKET:
-    case FD_PIPE:
-	F->read_method = &socket_read_method;
-	F->write_method = &socket_write_method;
-	break;
-    case FD_FILE:
-    case FD_LOG:
-	F->read_method = &file_read_method;
-	F->write_method = &file_write_method;
-	break;
+    F->flags.open = 1;
+#ifdef _SQUID_MSWIN_
+    switch (type) {
+    case FD_SOCKET:
+    case FD_PIPE:
+	F->read_method = &socket_read_method;
+	F->write_method = &socket_write_method;
+	break;
+    case FD_FILE:
+    case FD_LOG:
+	F->read_method = &file_read_method;
+	F->write_method = &file_write_method;
+	break;
     default:
 	F->read_method = &default_read_method;
-	F->write_method = &default_write_method;
-    }
-#else
-    F->read_method = &default_read_method;
-    F->write_method = &default_write_method;
+	F->write_method = &default_write_method;
+    }
+#else
+    F->read_method = &default_read_method;
+    F->write_method = &default_write_method;
 #endif
     fdUpdateBiggest(fd, 1);
     if (desc)
Index: squid/src/unlinkd.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/unlinkd.c,v
retrieving revision 1.6.10.1
retrieving revision 1.6.10.2
diff -u -r1.6.10.1 -r1.6.10.2
--- squid/src/unlinkd.c	18 Mar 2002 22:33:49 -0000	1.6.10.1
+++ squid/src/unlinkd.c	23 Mar 2002 10:51:55 -0000	1.6.10.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: unlinkd.c,v 1.6.10.1 2002/03/18 22:33:49 serassio Exp $
+ * $Id: unlinkd.c,v 1.6.10.2 2002/03/23 10:51:55 serassio Exp $
  *
  * DEBUG: section 12    Unlink Daemon
  * AUTHOR: Duane Wessels
@@ -74,11 +74,11 @@
 static int unlinkd_wfd = -1;
 static int unlinkd_rfd = -1;
 
-#ifdef _SQUID_MSWIN_
-static HANDLE hIpc;
-static pid_t pid;
-#endif
-
+#ifdef _SQUID_MSWIN_
+static HANDLE hIpc;
+static pid_t pid;
+#endif
+
 #define UNLINKD_QUEUE_LIMIT 20
 
 void
@@ -118,11 +118,11 @@
 	int x;
 	int i;
 	char rbuf[512];
-#ifdef _SQUID_MSWIN_
-	x = recv(unlinkd_rfd, rbuf, 511, 0);
-#else
-	x = read(unlinkd_rfd, rbuf, 511);
-#endif
+#ifdef _SQUID_MSWIN_
+	x = recv(unlinkd_rfd, rbuf, 511, 0);
+#else
+	x = read(unlinkd_rfd, rbuf, 511);
+#endif
 	if (x > 0) {
 	    rbuf[x] = '\0';
 	    for (i = 0; i < x; i++)
@@ -135,11 +135,11 @@
     assert(l < MAXPATHLEN);
     xstrncpy(buf, path, MAXPATHLEN);
     buf[l++] = '\n';
-#ifdef _SQUID_MSWIN_
-    x = send(unlinkd_wfd, buf, l, 0);
-#else
+#ifdef _SQUID_MSWIN_
+    x = send(unlinkd_wfd, buf, l, 0);
+#else
     x = write(unlinkd_wfd, buf, l);
-#endif
+#endif
     if (x < 0) {
 	debug(50, 1) ("unlinkdUnlink: write FD %d failed: %s\n",
 	    unlinkd_wfd, xstrerror());
@@ -158,37 +158,37 @@
 void
 unlinkdClose(void)
 {
-#ifdef _SQUID_MSWIN_
-    if (unlinkd_wfd > -1) {
-	debug(12, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
-	shutdown(unlinkd_wfd, SD_BOTH);
-	comm_close(unlinkd_wfd);
-	if (unlinkd_wfd != unlinkd_rfd)
-	    comm_close(unlinkd_rfd);
-	unlinkd_wfd = -1;
-	unlinkd_rfd = -1;
-    } else
-	debug(12, 0) ("unlinkdClose: WARNING: unlinkd_wfd is %d\n",
-	    unlinkd_wfd);
-    if (hIpc) {
-	if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) {
-	    getCurrentTime();
-	    debug(12, 1)
-		("unlinkdClose: WARNING: (unlinkd,%ld) didn't exit in 5 seconds\n",
-		pid);
-	}
-	CloseHandle(hIpc);
-    }
-#else
-    if (unlinkd_wfd < 0)
-	return;
+#ifdef _SQUID_MSWIN_
+    if (unlinkd_wfd > -1) {
+	debug(12, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
+	shutdown(unlinkd_wfd, SD_BOTH);
+	comm_close(unlinkd_wfd);
+	if (unlinkd_wfd != unlinkd_rfd)
+	    comm_close(unlinkd_rfd);
+	unlinkd_wfd = -1;
+	unlinkd_rfd = -1;
+    } else
+	debug(12, 0) ("unlinkdClose: WARNING: unlinkd_wfd is %d\n",
+	    unlinkd_wfd);
+    if (hIpc) {
+	if (WaitForSingleObject(hIpc, 5000) != WAIT_OBJECT_0) {
+	    getCurrentTime();
+	    debug(12, 1)
+		("unlinkdClose: WARNING: (unlinkd,%ld) didn't exit in 5 seconds\n",
+		pid);
+	}
+	CloseHandle(hIpc);
+    }
+#else
+    if (unlinkd_wfd < 0)
+	return;
     debug(12, 1) ("Closing unlinkd pipe on FD %d\n", unlinkd_wfd);
     file_close(unlinkd_wfd);
     if (unlinkd_wfd != unlinkd_rfd)
 	file_close(unlinkd_rfd);
     unlinkd_wfd = -1;
     unlinkd_rfd = -1;
-#endif
+#endif
 }
 
 void
@@ -202,9 +202,9 @@
 #if HAVE_POLL && defined(_SQUID_OSF_)
     /* pipes and poll() don't get along on DUNIX -DW */
     x = ipcCreate(IPC_TCP_SOCKET,
-#elif defined(_SQUID_MSWIN_)
-	/* select() will fail on a pipe */
-	x = ipcCreate(IPC_TCP_SOCKET,
+#elif defined(_SQUID_MSWIN_)
+	/* select() will fail on a pipe */
+	x = ipcCreate(IPC_TCP_SOCKET,
 #else
     x = ipcCreate(IPC_FIFO,
 #endif
@@ -212,11 +212,11 @@
 	args,
 	"unlinkd",
 	&unlinkd_rfd,
-	&unlinkd_wfd
-#ifdef _SQUID_MSWIN_
-	, &hIpc, &pid
-#endif
-	);
+	&unlinkd_wfd
+#ifdef _SQUID_MSWIN_
+	, &hIpc, &pid
+#endif
+	);
     if (x < 0)
 	fatal("Failed to create unlinkd subprocess");
     slp.tv_sec = 0;