Merged from trunk.

diff --cc acinclude.m4
Simple merge

diff --cc compat/os/mswin.h
Simple merge

diff --cc compat/os/openbsd.h
Simple merge

diff --cc compat/os/solaris.h
Simple merge

diff --cc configure.in
index dddbe3f19484e7650ae310007430487c0ba1c0a7,13ce8cc249711196b1195901941f5c7e8ca9ea85..f5999f0654841b769555dcf1d63ec8278887e0c7
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -2143,8 -2398,11 +2143,10 @@@ AC_ARG_WITH(filedescriptors
      esac
  ])
  
 -AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
  if $CPPUNITCONFIG --help >/dev/null; then
-   AC_MSG_NOTICE([using system installed cppunit])
+   squid_cv_cppunit_version="`$CPPUNITCONFIG --version`"
+   AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
+   unset squid_cv_cppunit_version
    SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
    SQUID_CPPUNIT_LA=''
    SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"

diff --cc helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c
Simple merge

diff --cc helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c
Simple merge

diff --cc include/config.h
index 23f5b8f2ca5d43468ea91e8afce76f85b26de685,5a5d751bc2a0be09a586a520d7c4ecac1b1439ca..b98992380e6b25cfa42b15833a33a10d904e28d0
--- 1/include/config.h
--- 2/include/config.h
+++ b/include/config.h
@@@ -63,122 -63,6 +63,121 @@@
  #endif
  #endif
  
- 
 +/* Typedefs for missing entries on a system */
 +
 +/* int8_t */
 +#if !HAVE_INT8_T
 +#if HAVE_CHAR && SIZEOF_CHAR == 1
 +typedef char int8_t;
 +#else
 +#error NO 8 bit signed type available
 +#endif
 +#endif
 +
 +/* u_int8_t */
 +#if !HAVE_U_INT8_T
 +#if HAVE_UINT8_T
 +typedef uint8_t u_int8_t;
 +#else
 +typedef unsigned char u_int8_t;
 +#endif
 +#endif
 +
 +/* int16_t */
 +#if !HAVE_INT16_T
 +#if HAVE_SHORT && SIZEOF_SHORT == 2
 +typedef short int16_t;
 +#elif HAVE_INT && SIZEOF_INT == 2
 +typedef int int16_t;
 +#else
 +#error NO 16 bit signed type available
 +#endif
 +#endif
 +
 +/* u_int16_t */
 +#if !HAVE_U_INT16_T
 +#if HAVE_UINT16_T
 +typedef uint16_t u_int16_t;
 +#else
 +typedef unsigned int16_t u_int16_t;
 +#endif
 +#endif
 +
 +/* int32_t */
 +#if !HAVE_INT32_T
 +#if HAVE_INT && SIZEOF_INT == 4
 +typedef int int32_t;
 +#elif HAVE_LONG && SIZEOF_LONG == 4
 +typedef long int32_t;
 +#else
 +#error NO 32 bit signed type available
 +#endif
 +#endif
 +
 +/* u_int32_t */
 +#if !HAVE_U_INT32_T
 +#if HAVE_UINT32_T
 +typedef uint32_t u_int32_t;
 +#else
 +typedef unsigned int32_t u_int32_t;
 +#endif
 +#endif
 +
 +/* int64_t */
 +#if !HAVE_INT64_T
 +#if HAVE___INT64
 +typedef __int64 int64_t;
 +#elif HAVE_LONG && SIZEOF_LONG == 8
 +typedef long int64_t;
 +#elif HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8
 +typedef long long int64_t;
 +#else
 +#error NO 64 bit signed type available
 +#endif
 +#endif
 +
 +/* u_int64_t */
 +#if !HAVE_U_INT64_T
 +#if HAVE_UINT64_T
 +typedef uint64_t u_int64_t;
 +#else
 +typedef unsigned int64_t u_int64_t;
 +#endif
 +#endif
 +
 +
 +#if !HAVE_PID_T
 +typedef int pid_t;
 +#endif
 +
 +#if !HAVE_SIZE_T
 +typedef unsigned int size_t;
 +#endif
 +
 +#if !HAVE_SSIZE_T
 +typedef int ssize_t;
 +#endif
 +
 +#if !HAVE_OFF_T
 +typedef int off_t;
 +#endif
 +
 +#if !HAVE_MODE_T
 +typedef unsigned short mode_t;
 +#endif
 +
 +#if !HAVE_FD_MASK
 +typedef unsigned long fd_mask;
 +#endif
 +
 +#if !HAVE_SOCKLEN_T
 +typedef int socklen_t;
 +#endif
 +
 +#if !HAVE_MTYP_T
 +typedef long mtyp_t;
 +#endif
 +
  #if !defined(CACHEMGR_HOSTNAME)
  #define CACHEMGR_HOSTNAME ""
  #else

diff --cc include/profiling.h
Simple merge

diff --cc include/squid_endian.h
Simple merge

diff --cc include/util.h
Simple merge

diff --cc lib/Profiler.c
index f274b03947537569ab4be06341c51c6db2032565,d026a3ce58b48a45f4272bdaa46d648417cb5bce..015b5f48498685a4d6bd3e0a4f6144a09758c269
--- 1/lib/Profiler.c
--- 2/lib/Profiler.c
+++ b/lib/Profiler.c
@@@ -105,13 -113,16 +113,16 @@@
   *
   */
  
- #include "profiling.h"
- 
- #include <assert.h>
+ #define SQUID_NO_ALLOC_PROTECT 1
+ #include "config.h"
  
 -#ifdef USE_XPROF_STATS
 +#if USE_XPROF_STATS
  
+ #include "profiling.h"
  
+ #if HAVE_ASSERT_H
+ #include <assert.h>
+ #endif
  #if HAVE_GNUMALLLOC_H
  #include <gnumalloc.h>
  #elif HAVE_MALLOC_H

diff --cc lib/getaddrinfo.c
Simple merge

diff --cc lib/getnameinfo.c
index 33c97d0fa762323b1ed76c5bdab9b2bb0af88302,bec315ba56ab2805855147212f76b25c24f1dc88..16aba171cef99d8c0d41a0214eb10b152199d22f
--- 1/lib/getnameinfo.c
--- 2/lib/getnameinfo.c
+++ b/lib/getnameinfo.c
@@@ -75,11 -75,11 +75,11 @@@
   *     - gethostbyaddr() is usually not thread safe.
   */
  
 -#ifndef HAVE_GETNAMEINFO
 +#if !HAVE_GETNAMEINFO
  
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
+ #include "compat/inet_ntop.h"
+ #include "compat/getaddrinfo.h"
+ 
  #if HAVE_STDIO_H
  #include <stdio.h>
  #endif

diff --cc lib/initgroups.c
Simple merge

diff --cc lib/rfc1123.c
Simple merge

diff --cc snmplib/mib.c
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/String.cc
Simple merge

diff --cc src/cbdata.cc
Simple merge

diff --cc src/client_side_request.cc
Simple merge

diff --cc src/comm_poll.cc
index 99c4ea43916d1fbb592fbbee6ab4f73b81d5bc3f,cec07ac256377251ca7435b48ea674769aa466ef..82be872279bb14a276597d6ed939d791c2f6e699
--- 1/src/comm_poll.cc
--- 2/src/comm_poll.cc
+++ b/src/comm_poll.cc
@@@ -39,8 -38,22 +38,22 @@@
  #include "Store.h"
  #include "fde.h"
  
 -#ifdef USE_POLL
 +#if USE_POLL
  
+ #if HAVE_POLL_H
+ #include <poll.h>
+ #endif
+ 
+ /* Needed for poll() on Linux at least */
+ #if USE_POLL
+ #ifndef POLLRDNORM
+ #define POLLRDNORM POLLIN
+ #endif
+ #ifndef POLLWRNORM
+ #define POLLWRNORM POLLOUT
+ #endif
+ #endif
+ 
  static int MAX_POLL_TIME = 1000;      /* see also comm_quick_poll_required() */
  
  #ifndef        howmany

diff --cc src/dns.cc
Simple merge

diff --cc src/dns_internal.cc
Simple merge

diff --cc src/dnsserver.cc
index 44369f69bda3b1f1b8949ef21f52dca6076498c6,441815d49856694ca490edd31c155ff82b135e69..b64cc9bb30f21ec0d1c28598d06c88057ba18df2
--- 1/src/dnsserver.cc
--- 2/src/dnsserver.cc
+++ b/src/dnsserver.cc
@@@ -119,12 -109,9 +109,9 @@@
  #if HAVE_BSTRING_H
  #include <bstring.h>
  #endif
 -#ifdef HAVE_CRYPT_H
 +#if HAVE_CRYPT_H
  #include <crypt.h>
  #endif
- #if HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
  #if HAVE_GETOPT_H
  #include <getopt.h>
  #endif
@@@ -335,10 -322,10 +322,10 @@@ lookup(const char *buf
          /* deprecated. obsolete on some OS */
      case EAI_NODATA:
  #endif
 -#ifdef EAI_NONAME
 +#if EAI_NONAME
      case EAI_NONAME:
  #endif
-         printf("$fail DNS Domain/IP '%s' exists without any FQDN/IPs: %s.\n", buf, xgai_strerror(res));
+         printf("$fail DNS Domain/IP '%s' exists without any FQDN/IPs: %s.\n", buf, gai_strerror(res));
          break;
  #endif
      default:

diff --cc src/fqdncache.cc
Simple merge

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

diff --cc src/fs/ufs/ufscommon.h
Simple merge

diff --cc src/ipcache.cc
Simple merge

diff --cc src/main.cc
Simple merge

diff --cc src/protos.h
Simple merge

diff --cc src/squid.h
index 86b033ba93cf0dd43147c8617a169b25dd057ec5,5701aa8f415cdb6c4ba3faedb2845f6e10af0300..88fc34c247f9ff79986acb231849576709559aa6
--- 1/src/squid.h
--- 2/src/squid.h
+++ b/src/squid.h
@@@ -270,26 -157,11 +157,11 @@@ using namespace Squid
  #if USE_SSL
  #include "ssl_support.h"
  #endif
- 
- /* Needed for poll() on Linux at least */
- #if USE_POLL
- #ifndef POLLRDNORM
- #define POLLRDNORM POLLIN
- #endif
- #ifndef POLLWRNORM
- #define POLLWRNORM POLLOUT
- #endif
- #endif
- 
 -#ifdef SQUID_SNMP
 +#if SQUID_SNMP
  #include "cache_snmp.h"
  #endif
- 
  #include "hash.h"
  #include "rfc3596.h"
- 
- 
  #include "defines.h"
  #include "enums.h"
  #include "typedefs.h"

diff --cc src/ssl_support.cc
Simple merge

diff --cc src/store.cc
Simple merge

diff --cc src/tools.cc
Simple merge

diff --cc test-suite/hash.c
Simple merge

diff --cc test-suite/pconn-banger.c
index e5a95f999638067805ede71a22c6f33615ccebed,0527d0662767836078dbf8166236433d678594d4..6f0b135c37633c4c7c28987caecef30383fd49f0
--- 1/test-suite/pconn-banger.c
--- 2/test-suite/pconn-banger.c
+++ b/test-suite/pconn-banger.c
@@@ -44,21 -10,15 +10,15 @@@
  #if HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
 -#ifdef HAVE_STRING_H
 +#if HAVE_STRING_H
  #include <string.h>
  #endif
 -#ifdef HAVE_STRINGS_H
 +#if HAVE_STRINGS_H
  #include <strings.h>
  #endif
 -#ifdef HAVE_BSTRING_H
 +#if HAVE_BSTRING_H
  #include <bstring.h>
  #endif
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
  #if HAVE_SIGNAL_H
  #include <signal.h>
  #endif

diff --cc test-suite/tcp-banger2.c
index 62a335938a631f89d2b51b6cab1bfe6a44bf266d,d3072c43796b5c089f53b13d7c568551af2440ea..4c775497eb119d09b2d6749245ac270d867484c0
--- 1/test-suite/tcp-banger2.c
--- 2/test-suite/tcp-banger2.c
+++ b/test-suite/tcp-banger2.c
@@@ -45,18 -42,12 +42,12 @@@
  #if HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
 -#ifdef HAVE_STRING_H
 +#if HAVE_STRING_H
  #include <string.h>
  #endif
 -#ifdef HAVE_STRINGS_H
 +#if HAVE_STRINGS_H
  #include <strings.h>
  #endif
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
  #if HAVE_SIGNAL_H
  #include <signal.h>
  #endif

diff --cc test-suite/tcp-banger3.c
index 731685d5ec418cc591076ab4c5ffafa8f4f81ae9,79c3470688122109747fe75bc0970099ceeac7c7..71615036162a7d5c152b244e302cabae7e6679a9
--- 1/test-suite/tcp-banger3.c
--- 2/test-suite/tcp-banger3.c
+++ b/test-suite/tcp-banger3.c
@@@ -43,18 -40,12 +40,12 @@@
  #if HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
 -#ifdef HAVE_STRING_H
 +#if HAVE_STRING_H
  #include <string.h>
  #endif
 -#ifdef HAVE_STRINGS_H
 +#if HAVE_STRINGS_H
  #include <strings.h>
  #endif
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
- #if HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
  #if HAVE_SIGNAL_H
  #include <signal.h>
  #endif