Merged from trunk

diff --cc compat/mswin.cc
Simple merge

diff --cc compat/xalloc.cc
Simple merge

diff --cc helpers/basic_auth/SSPI/basic_sspi_auth.cc
index 945a16a3aa1757e4fe85596c4fcd8f36ac03c33b,ef43acfe3cec3818155ac391ddcde33791702f02..63339871195374d9504a5eb8ffcf49d4ba74b57f
--- 1/helpers/basic_auth/SSPI/basic_sspi_auth.cc
--- 2/helpers/basic_auth/SSPI/basic_sspi_auth.cc
+++ b/helpers/basic_auth/SSPI/basic_sspi_auth.cc
@@@ -24,10 -24,8 +24,10 @@@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
  
- #include "config.h"
+ #include "squid.h"
  #include "helpers/defines.h"
 +#include "rfc1738.h"
 +#include "sspwin32.h"
  #include "util.h"
  
  #if HAVE_STDIO_H

diff --cc helpers/basic_auth/SSPI/valid.cc
Simple merge

diff --cc helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc
Simple merge

diff --cc helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
index f87f223cad88bf57caa62629585511375883af0a,035668052393a2f76801e1c1632e2c97f778fb10..d5640dfa055a898045fe4f9288c757679e1227a4
--- 1/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
--- 2/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
+++ b/helpers/negotiate_auth/SSPI/negotiate_sspi_auth.cc
@@@ -36,9 -36,9 +36,9 @@@
   *
   *
   */
- #include "config.h"
+ #include "squid.h"
  #include "helpers/defines.h"
 -#include "libntlmauth/support_bits.cci"
 +#include "ntlmauth/support_bits.cci"
  #include "sspwin32.h"
  #include "util.h"
  

diff --cc helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
index 96945d688c22756c24a226eb09c45b943eff8d8e,5f209ca2f6b68c39034583607e1913b80e55081d..b4d65243e4d1a4d181d43c237918bb91fc9c865a
--- 1/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
--- 2/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
+++ b/helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
@@@ -63,11 -63,10 +63,11 @@@
  
  typedef unsigned char uchar;
  
- #include "config.h"
+ #include "squid.h"
 +#include "base64.h"
  #include "helpers/defines.h"
 -#include "libntlmauth/ntlmauth.h"
 -#include "libntlmauth/support_bits.h"
 +#include "ntlmauth/ntlmauth.h"
 +#include "ntlmauth/support_bits.cci"
  #include "sspwin32.h"
  #include "util.h"
  

diff --cc lib/rfcnb/rfcnb-io.c
Simple merge

diff --cc lib/sspwin32.c
index 7d09adcc643331f8e6713e9584f26d6bf5b97e2c,434d97296a50526874f0a9f30200e8e999293a66..c8991976088ef3ec34666b9b24b3563eeeb23764
--- 1/lib/sspwin32.c
--- 2/lib/sspwin32.c
+++ b/lib/sspwin32.c
@@@ -33,11 -33,11 +33,11 @@@
   *
   */
  
- #include "config.h"
+ #include "squid.h"
 -#include "util.h"
 -
 -#include "libntlmauth/ntlmauth.h"
 +#include "base64.h"
 +#include "ntlmauth/ntlmauth.h"
  #include "sspwin32.h"
 +#include "util.h"
  
  typedef struct _AUTH_SEQ {
      BOOL fInitialized;

diff --cc src/DiskIO/DiskThreads/aiops_win32.cc
index b7b30235f6036b71b1a44dc55eaa07ec1bfd2624,5afce973a41223d6aa2f8986054d5a101c8413d2..6d21ef84c3d665579768b1a2090014b59bc1647e
--- 1/src/DiskIO/DiskThreads/aiops_win32.cc
--- 2/src/DiskIO/DiskThreads/aiops_win32.cc
+++ b/src/DiskIO/DiskThreads/aiops_win32.cc
@@@ -34,7 -34,8 +34,7 @@@
   *
   */
  
- #include "squid.h"
+ #include "squid-old.h"
 -#include "squid_windows.h"
  #include "CommIO.h"
  #include "DiskThreads.h"
  #include "SquidTime.h"

diff --cc src/WinSvc.cc
index 3e4ed672f58baa3e977ae8d93c464033a5c8518d,5cfcbb62198de8da627a53ee1e8c755486d36391..6cdb28faafbda2d8984ad6028b11cd9c253aeba5
--- 1/src/WinSvc.cc
--- 2/src/WinSvc.cc
+++ b/src/WinSvc.cc
@@@ -34,7 -34,8 +34,7 @@@
   *
   */
  
- #include "squid.h"
+ #include "squid-old.h"
 -#include "squid_windows.h"
  
  #if _SQUID_MSWIN_
  #ifndef _MSWSOCK_

diff --cc src/acl/HttpStatus.cc
index 5656c50586c25cbbacefbd4eab4521fff6158982,0d4cee4c867859f743dc0d68dab6108a34b2e02f..d8d5f1f4af98224a925957b75c043685e132e447
--- 1/src/acl/HttpStatus.cc
--- 2/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@@ -34,8 -34,11 +34,7 @@@
   * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
   */
  
- #include "config.h"
  #include "squid.h"
 -#if _SQUID_CYGWIN_
 -#include <squid_windows.h>
 -#endif
 -#include "squid-old.h"
  
  #include "acl/HttpStatus.h"
  #include "acl/FilledChecklist.h"

diff --cc src/acl/Ip.cc
index 92e401e13a586fb076fd8f1cdb003ff29c5c331a,b1c05c360c5b631dfad1ef8c25107f6c6bbfdbab..ff5fae215114f22595b1b0219b27ec0e45ad8e1f
--- 1/src/acl/Ip.cc
--- 2/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@@ -33,10 -33,10 +33,10 @@@
   * Copyright (c) 2003, Robert Collins <robertc@squid-cache.org>
   */
  
- #include "squid.h"
+ #include "squid-old.h"
 -//#include "compat/getaddrinfo.h"
  #include "acl/Ip.h"
  #include "acl/Checklist.h"
 +#include "compat/getaddrinfo.h"
  #include "ip/tools.h"
  #include "MemBuf.h"
  #include "wordlist.h"

diff --cc src/cf.data.pre
Simple merge

diff --cc src/comm/ConnOpener.cc
Simple merge

diff --cc src/comm/TcpAcceptor.cc
Simple merge

diff --cc src/dns_internal.cc
Simple merge

diff --cc src/eui/Eui48.cc
Simple merge

diff --cc src/fs/coss/store_dir_coss.cc
Simple merge

diff --cc src/fs/ufs/store_dir_ufs.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/ssl/certificate_db.cc
Simple merge

diff --cc src/tools.cc
Simple merge

diff --cc src/win32.cc
index e4ad1973d3f34f0a1468aabb5e8049a6ebc0a62d,3d5f0cb38f938b0645c7c89b37dea2c5602e408c..af8a0a3efbdff4fa4fc5d4a0a5636c72487334e7
--- 1/src/win32.cc
--- 2/src/win32.cc
+++ b/src/win32.cc
@@@ -33,7 -33,8 +33,7 @@@
   *
   */
  
- #include "squid.h"
+ #include "squid-old.h"
 -#include "squid_windows.h"
  
  #if _SQUID_MSWIN_
  #if HAVE_WIN32_PSAPI

diff --cc tools/purge/convert.cc
Simple merge

diff --cc tools/purge/copyout.cc
Simple merge

diff --cc tools/purge/purge.cc
Simple merge

diff --cc tools/purge/signal.cc
Simple merge

diff --cc tools/purge/socket.cc
Simple merge