------------------------------------------------------------
revno: 12290
revision-id: kinkie@squid-cache.org-20120815151732-11rihmtze186wsga
parent: kinkie@squid-cache.org-20120815145811-237orwvzoenrr0n8
committer: Francesco Chemolli <kinkie@squid-cache.org>
branch nick: trunk
timestamp: Wed 2012-08-15 17:17:32 +0200
message:
  Add missing includes
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kinkie@squid-cache.org-20120815151732-11rihmtze186wsga
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: 55aef1f2b4c4940e9ff7beeeb81babc214aa0e02
# timestamp: 2012-08-15 15:51:42 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: kinkie@squid-cache.org-20120815145811-\
#   237orwvzoenrr0n8
# 
# Begin patch
=== modified file 'compat/xstrerror.h'
--- compat/xstrerror.h	2011-08-07 09:29:11 +0000
+++ compat/xstrerror.h	2012-08-15 15:17:32 +0000
@@ -1,6 +1,10 @@
 #ifndef _SQUID_COMPAT_XSTRERROR_H
 #define _SQUID_COMPAT_XSTRERROR_H
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 /** strerror() wrapper replacement.
  *
  * Provides the guarantee that a string is always returned.

=== modified file 'lib/Array.cc'
--- lib/Array.cc	2012-01-20 18:55:04 +0000
+++ lib/Array.cc	2012-08-15 15:17:32 +0000
@@ -49,5 +49,3 @@
 #if HAVE_STRING_H
 #include <string.h>
 #endif
-#include "util.h"
-#include "Array.h"

=== modified file 'src/DiskIO/AIO/AIODiskFile.cc'
--- src/DiskIO/AIO/AIODiskFile.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/AIO/AIODiskFile.cc	2012-08-15 15:17:32 +0000
@@ -52,6 +52,10 @@
 #include "DiskIO/WriteRequest.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 CBDATA_CLASS_INIT(AIODiskFile);
 void *
 AIODiskFile::operator new(size_t unused)

=== modified file 'src/DiskIO/AIO/aio_win32.cc'
--- src/DiskIO/AIO/aio_win32.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/AIO/aio_win32.cc	2012-08-15 15:17:32 +0000
@@ -37,6 +37,10 @@
 #include "comm.h"
 #include "aio_win32.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 #if _SQUID_WINDOWS_
 VOID CALLBACK IoCompletionRoutine(DWORD dwErrorCode,
                                   DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped)

=== modified file 'src/DiskIO/Blocking/BlockingFile.cc'
--- src/DiskIO/Blocking/BlockingFile.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/Blocking/BlockingFile.cc	2012-08-15 15:17:32 +0000
@@ -40,6 +40,9 @@
 #include "DiskIO/WriteRequest.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 CBDATA_CLASS_INIT(BlockingFile);
 
 void *

=== modified file 'src/DiskIO/DiskDaemon/DiskdIOStrategy.cc'
--- src/DiskIO/DiskDaemon/DiskdIOStrategy.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/DiskDaemon/DiskdIOStrategy.cc	2012-08-15 15:17:32 +0000
@@ -48,6 +48,9 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/shm.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 diskd_stats_t diskd_stats;
 

=== modified file 'src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc'
--- src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc	2012-08-15 15:17:32 +0000
@@ -45,6 +45,10 @@
 #include "Store.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 /* === PUBLIC =========================================================== */
 
 CBDATA_CLASS_INIT(DiskThreadsDiskFile);

=== modified file 'src/DiskIO/IpcIo/IpcIoFile.cc'
--- src/DiskIO/IpcIo/IpcIoFile.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/IpcIo/IpcIoFile.cc	2012-08-15 15:17:32 +0000
@@ -12,16 +12,19 @@
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
 #include "globals.h"
+#include "ipc/mem/Pages.h"
 #include "ipc/Messages.h"
 #include "ipc/Port.h"
 #include "ipc/Queue.h"
 #include "ipc/StrandSearch.h"
 #include "ipc/UdsOp.h"
-#include "ipc/mem/Pages.h"
+#include "protos.h"
+#include "SquidTime.h"
 #include "StatCounters.h"
-#include "SquidTime.h"
-#include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 CBDATA_CLASS_INIT(IpcIoFile);
 
 /// shared memory segment path to use for IpcIoFile maps

=== modified file 'src/DiskIO/Mmapped/MmappedFile.cc'
--- src/DiskIO/Mmapped/MmappedFile.cc	2012-08-14 11:53:07 +0000
+++ src/DiskIO/Mmapped/MmappedFile.cc	2012-08-15 15:17:32 +0000
@@ -19,6 +19,9 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 CBDATA_CLASS_INIT(MmappedFile);
 

=== modified file 'src/HttpHeaderTools.cc'
--- src/HttpHeaderTools.cc	2012-08-14 11:53:07 +0000
+++ src/HttpHeaderTools.cc	2012-08-15 15:17:32 +0000
@@ -54,6 +54,9 @@
 
 #include <algorithm>
 #include <string>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 static void httpHeaderPutStrvf(HttpHeader * hdr, http_hdr_type id, const char *fmt, va_list vargs);
 

=== modified file 'src/acl/Method.h'
--- src/acl/Method.h	2012-08-14 11:53:07 +0000
+++ src/acl/Method.h	2012-08-15 15:17:32 +0000
@@ -44,7 +44,7 @@
 {
 
 public:
-    virtual int match (ACLData<ACLStrategy::MatchType> * &, ACLFilledChecklist *);
+    virtual int match (ACLData<MatchType> * &, ACLFilledChecklist *);
     virtual bool requiresRequest() const {return true;}
 
     static ACLMethodStrategy *Instance();

=== modified file 'src/cache_diff.cc'
--- src/cache_diff.cc	2012-08-14 11:53:07 +0000
+++ src/cache_diff.cc	2012-08-15 15:17:32 +0000
@@ -40,6 +40,10 @@
 
 #include "squid.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 typedef struct {
     const char *name;
     hash_table *hash;

=== modified file 'src/comm.cc'
--- src/comm.cc	2012-08-14 11:53:07 +0000
+++ src/comm.cc	2012-08-15 15:17:32 +0000
@@ -79,6 +79,9 @@
 #if HAVE_MATH_H
 #include <math.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 /*
  * New C-like simple comm code. This stuff is a mess and doesn't really buy us anything.

=== modified file 'src/comm/ConnOpener.cc'
--- src/comm/ConnOpener.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ConnOpener.cc	2012-08-15 15:17:32 +0000
@@ -14,6 +14,10 @@
 #include "SquidTime.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 CBDATA_NAMESPACED_CLASS_INIT(Comm, ConnOpener);
 
 Comm::ConnOpener::ConnOpener(Comm::ConnectionPointer &c, AsyncCall::Pointer &handler, time_t ctimeout) :

=== modified file 'src/comm/ModDevPoll.cc'
--- src/comm/ModDevPoll.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ModDevPoll.cc	2012-08-15 15:17:32 +0000
@@ -67,6 +67,9 @@
 /* Solaris /dev/poll support, see "man -s 7D poll" */
 #include <sys/devpoll.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 #define DEBUG_DEVPOLL 0
 

=== modified file 'src/comm/ModEpoll.cc'
--- src/comm/ModEpoll.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ModEpoll.cc	2012-08-15 15:17:32 +0000
@@ -70,6 +70,9 @@
 #if HAVE_SYS_EPOLL_H
 #include <sys/epoll.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 static int kdpfd;
 static int max_poll_time = 1000;

=== modified file 'src/comm/ModKqueue.cc'
--- src/comm/ModKqueue.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ModKqueue.cc	2012-08-15 15:17:32 +0000
@@ -64,6 +64,9 @@
 #if HAVE_SYS_EVENT_H
 #include <sys/event.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 #define KE_LENGTH        128
 

=== modified file 'src/comm/ModPoll.cc'
--- src/comm/ModPoll.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ModPoll.cc	2012-08-15 15:17:32 +0000
@@ -49,6 +49,9 @@
 #if HAVE_POLL_H
 #include <poll.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 /* Needed for poll() on Linux at least */
 #if USE_POLL

=== modified file 'src/comm/ModSelect.cc'
--- src/comm/ModSelect.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ModSelect.cc	2012-08-15 15:17:32 +0000
@@ -49,6 +49,9 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 static int MAX_POLL_TIME = 1000;	/* see also Comm::QuickPollRequired() */
 

=== modified file 'src/comm/ModSelectWin32.cc'
--- src/comm/ModSelectWin32.cc	2012-08-14 11:53:07 +0000
+++ src/comm/ModSelectWin32.cc	2012-08-15 15:17:32 +0000
@@ -44,6 +44,10 @@
 #include "StatHist.h"
 #include "Store.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 static int MAX_POLL_TIME = 1000;	/* see also Comm::QuickPollRequired() */
 
 #ifndef        howmany

=== modified file 'src/comm/TcpAcceptor.cc'
--- src/comm/TcpAcceptor.cc	2012-08-14 11:53:07 +0000
+++ src/comm/TcpAcceptor.cc	2012-08-15 15:17:32 +0000
@@ -47,6 +47,10 @@
 #include "SquidTime.h"
 #include "StatCounters.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 namespace Comm
 {
 CBDATA_CLASS_INIT(TcpAcceptor);

=== modified file 'src/comm/Write.cc'
--- src/comm/Write.cc	2012-08-14 11:53:07 +0000
+++ src/comm/Write.cc	2012-08-15 15:17:32 +0000
@@ -1,17 +1,21 @@
 #include "squid.h"
-#if USE_DELAY_POOLS
-#include "ClientInfo.h"
-#endif
 #include "comm/Connection.h"
 #include "comm/IoCallback.h"
 #include "comm/Write.h"
 #include "fde.h"
 #include "globals.h"
-#include "StatCounters.h"
-#include "SquidTime.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
+#include "SquidTime.h"
+#include "StatCounters.h"
+
+#if USE_DELAY_POOLS
+#include "ClientInfo.h"
+#endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 void
 Comm::Write(const Comm::ConnectionPointer &conn, MemBuf *mb, AsyncCall::Pointer &callback)

=== modified file 'src/disk.cc'
--- src/disk.cc	2012-08-14 11:53:07 +0000
+++ src/disk.cc	2012-08-15 15:17:32 +0000
@@ -40,6 +40,10 @@
 #include "protos.h"
 #include "StatCounters.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 static PF diskHandleRead;
 static PF diskHandleWrite;
 

=== modified file 'src/dns_internal.cc'
--- src/dns_internal.cc	2012-08-14 11:53:07 +0000
+++ src/dns_internal.cc	2012-08-15 15:17:32 +0000
@@ -57,6 +57,9 @@
 #if HAVE_RESOLV_H
 #include <resolv.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 /* MS Visual Studio Projects are monolithic, so we need the following
    #ifndef to exclude the internal DNS code from compile process when

=== modified file 'src/esi/Expression.cc'
--- src/esi/Expression.cc	2012-08-14 11:53:07 +0000
+++ src/esi/Expression.cc	2012-08-15 15:17:32 +0000
@@ -41,6 +41,9 @@
 #if HAVE_MATH_H
 #include <math.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 /* stack precedence rules:
  * before pushing an operator onto the stack, the

=== modified file 'src/eui/Eui48.cc'
--- src/eui/Eui48.cc	2012-08-06 17:41:08 +0000
+++ src/eui/Eui48.cc	2012-08-15 15:17:32 +0000
@@ -41,7 +41,9 @@
 #include "globals.h"
 #include "ip/Address.h"
 
-
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 #if _SQUID_CYGWIN_
 #include <squid_windows.h>
 #endif

=== modified file 'src/forward.cc'
--- src/forward.cc	2012-08-14 11:53:07 +0000
+++ src/forward.cc	2012-08-15 15:17:32 +0000
@@ -66,6 +66,9 @@
 #include "ssl/ErrorDetail.h"
 #include "ssl/ServerBump.h"
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 static PSC fwdPeerSelectionCompleteWrapper;
 static CLCB fwdServerClosedWrapper;

=== modified file 'src/fs/coss/store_dir_coss.cc'
--- src/fs/coss/store_dir_coss.cc	2012-08-14 11:53:07 +0000
+++ src/fs/coss/store_dir_coss.cc	2012-08-15 15:17:32 +0000
@@ -36,7 +36,6 @@
 #include "squid.h"
 #include "CossSwapDir.h"
 #include "Store.h"
-
 #include "store_coss.h"
 #include "event.h"
 #include "fde.h"
@@ -51,6 +50,10 @@
 #include "swap_log_op.h"
 #include "SquidMath.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 #define STORE_META_BUFSZ 4096
 
 int n_coss_dirs = 0;

=== modified file 'src/fs/rock/RockRebuild.cc'
--- src/fs/rock/RockRebuild.cc	2012-08-14 11:53:07 +0000
+++ src/fs/rock/RockRebuild.cc	2012-08-15 15:17:32 +0000
@@ -13,6 +13,10 @@
 #include "typedefs.h"
 #include "SquidTime.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 CBDATA_NAMESPACED_CLASS_INIT(Rock, Rebuild);
 
 Rock::Rebuild::Rebuild(SwapDir *dir): AsyncJob("Rock::Rebuild"),

=== modified file 'src/fs/ufs/RebuildState.cc'
--- src/fs/ufs/RebuildState.cc	2012-08-14 11:53:07 +0000
+++ src/fs/ufs/RebuildState.cc	2012-08-15 15:17:32 +0000
@@ -44,6 +44,9 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,RebuildState);
 

=== modified file 'src/fs/ufs/UFSSwapDir.cc'
--- src/fs/ufs/UFSSwapDir.cc	2012-08-14 11:53:07 +0000
+++ src/fs/ufs/UFSSwapDir.cc	2012-08-15 15:17:32 +0000
@@ -54,6 +54,9 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 int Fs::Ufs::UFSSwapDir::NumberOfUFSDirs = 0;
 int *Fs::Ufs::UFSSwapDir::UFSDirToGlobalDirMapping = NULL;

=== modified file 'src/ftp.cc'
--- src/ftp.cc	2012-08-14 11:53:07 +0000
+++ src/ftp.cc	2012-08-15 15:17:32 +0000
@@ -65,6 +65,10 @@
 #include "MemObject.h"
 #endif
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 /**
  \defgroup ServerProtocolFTPInternal Server-Side FTP Internals
  \ingroup ServerProtocolFTPAPI

=== modified file 'src/icmp/IcmpPinger.cc'
--- src/icmp/IcmpPinger.cc	2012-08-14 11:53:07 +0000
+++ src/icmp/IcmpPinger.cc	2012-08-15 15:17:32 +0000
@@ -44,6 +44,10 @@
 #include "Icmp6.h"
 #include "Debug.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 IcmpPinger::IcmpPinger() : Icmp()
 {
     // these start invalid. Setup properly in Open()

=== modified file 'src/icmp/IcmpSquid.cc'
--- src/icmp/IcmpSquid.cc	2012-08-14 11:53:07 +0000
+++ src/icmp/IcmpSquid.cc	2012-08-15 15:17:32 +0000
@@ -41,6 +41,10 @@
 #include "protos.h"
 #include "SquidTime.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 // Instance global to be available in main() and elsewhere.
 IcmpSquid icmpEngine;
 

=== modified file 'src/icp_v2.cc'
--- src/icp_v2.cc	2012-08-14 11:53:07 +0000
+++ src/icp_v2.cc	2012-08-15 15:17:32 +0000
@@ -58,6 +58,10 @@
 #include "SwapDir.h"
 #include "wordlist.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 static void icpIncomingConnectionOpened(const Comm::ConnectionPointer &conn, int errNo);
 
 /// \ingroup ServerProtocolICPInternal2

=== modified file 'src/ip/Intercept.cc'
--- src/ip/Intercept.cc	2012-01-20 18:55:04 +0000
+++ src/ip/Intercept.cc	2012-08-15 15:17:32 +0000
@@ -70,6 +70,9 @@
 #elif HAVE_NETINET_IP_NAT_H
 #include <netinet/ip_nat.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 #endif /* IPF_TRANSPARENT required headers */
 

=== modified file 'src/ip/QosConfig.cc'
--- src/ip/QosConfig.cc	2012-08-14 11:53:07 +0000
+++ src/ip/QosConfig.cc	2012-08-15 15:17:32 +0000
@@ -11,6 +11,10 @@
 #include "Parsing.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 /* Qos namespace */
 
 void

=== modified file 'src/ipc/Coordinator.cc'
--- src/ipc/Coordinator.cc	2012-08-14 11:53:07 +0000
+++ src/ipc/Coordinator.cc	2012-08-15 15:17:32 +0000
@@ -23,6 +23,9 @@
 #include "snmp/Request.h"
 #include "snmp/Response.h"
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 CBDATA_NAMESPACED_CLASS_INIT(Ipc, Coordinator);
 Ipc::Coordinator* Ipc::Coordinator::TheInstance = NULL;

=== modified file 'src/ipc/StartListening.cc'
--- src/ipc/StartListening.cc	2012-08-14 11:53:07 +0000
+++ src/ipc/StartListening.cc	2012-08-15 15:17:32 +0000
@@ -13,6 +13,10 @@
 #include "ipc/StartListening.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 Ipc::StartListeningCb::StartListeningCb(): conn(NULL), errNo(0)
 {
 }

=== modified file 'src/ipc_win32.cc'
--- src/ipc_win32.cc	2012-08-14 11:53:07 +0000
+++ src/ipc_win32.cc	2012-08-15 15:17:32 +0000
@@ -44,6 +44,9 @@
 #include <mswsock.h>
 #endif
 #include <process.h>
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 struct ipc_params {
     int type;

=== modified file 'src/log/ModDaemon.cc'
--- src/log/ModDaemon.cc	2012-08-14 11:53:07 +0000
+++ src/log/ModDaemon.cc	2012-08-15 15:17:32 +0000
@@ -41,6 +41,10 @@
 #include "protos.h"
 #include "SquidTime.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 /* How many buffers to keep before we say we've buffered too much */
 #define	LOGFILE_MAXBUFS		128
 

=== modified file 'src/log/ModStdio.cc'
--- src/log/ModStdio.cc	2012-08-14 11:53:07 +0000
+++ src/log/ModStdio.cc	2012-08-15 15:17:32 +0000
@@ -37,6 +37,10 @@
 #include "log/ModStdio.h"
 #include "protos.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 typedef struct {
     int fd;
     char *buf;

=== modified file 'src/log/ModTcp.cc'
--- src/log/ModTcp.cc	2012-08-14 11:53:07 +0000
+++ src/log/ModTcp.cc	2012-08-15 15:17:32 +0000
@@ -40,6 +40,9 @@
 #include "protos.h"
 #include "structs.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 /*
  * This logfile TCP module is mostly inspired by a patch by Tim Starling
  * from Wikimedia.

=== modified file 'src/log/ModUdp.cc'
--- src/log/ModUdp.cc	2012-08-14 11:53:07 +0000
+++ src/log/ModUdp.cc	2012-08-15 15:17:32 +0000
@@ -39,6 +39,10 @@
 #include "protos.h"
 #include "structs.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 /*
  * This logfile UDP module is mostly inspired by a patch by Tim Starling
  * from Wikimedia.

=== modified file 'src/main.cc'
--- src/main.cc	2012-08-14 11:53:07 +0000
+++ src/main.cc	2012-08-15 15:17:32 +0000
@@ -122,6 +122,9 @@
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 #if USE_WIN32_SERVICE
 #include "squid_windows.h"

=== modified file 'src/ssl/support.cc'
--- src/ssl/support.cc	2012-08-14 11:53:07 +0000
+++ src/ssl/support.cc	2012-08-15 15:17:32 +0000
@@ -48,6 +48,10 @@
 #include "ssl/support.h"
 #include "ssl/gadgets.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 const char *Ssl::BumpModeStr[] = {
     "none",
     "client-first",

=== modified file 'src/store_dir.cc'
--- src/store_dir.cc	2012-08-14 11:53:07 +0000
+++ src/store_dir.cc	2012-08-15 15:17:32 +0000
@@ -43,6 +43,7 @@
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "StoreHashIndex.h"
 #include "SwapDir.h"
 #include "swap_log_op.h"
 
@@ -65,8 +66,10 @@
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
-#include "StoreHashIndex.h"
 
 static STDIRSELECT storeDirSelectSwapDirRoundRobin;
 static STDIRSELECT storeDirSelectSwapDirLeastLoad;

=== modified file 'src/store_rebuild.cc'
--- src/store_rebuild.cc	2012-08-14 11:53:07 +0000
+++ src/store_rebuild.cc	2012-08-15 15:17:32 +0000
@@ -44,6 +44,9 @@
 #include "StoreSearch.h"
 #include "SquidTime.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 static struct _store_rebuild_data counts;
 
 static struct timeval rebuild_start;

=== modified file 'src/test_cache_digest.cc'
--- src/test_cache_digest.cc	2012-08-14 11:53:07 +0000
+++ src/test_cache_digest.cc	2012-08-15 15:17:32 +0000
@@ -38,6 +38,10 @@
 
 #include "squid.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 typedef struct {
     int query_count;
     int true_hit_count;

=== modified file 'src/tools.cc'
--- src/tools.cc	2012-08-14 11:53:07 +0000
+++ src/tools.cc	2012-08-15 15:17:32 +0000
@@ -62,6 +62,9 @@
 #if HAVE_GRP_H
 #include <grp.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 #define DEAD_MSG "\
 The Squid Cache (version %s) died.\n\

=== modified file 'src/tunnel.cc'
--- src/tunnel.cc	2012-08-14 11:53:07 +0000
+++ src/tunnel.cc	2012-08-15 15:17:32 +0000
@@ -58,6 +58,9 @@
 #if HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
 
 class TunnelStateData
 {

=== modified file 'src/whois.cc'
--- src/whois.cc	2012-08-14 11:53:07 +0000
+++ src/whois.cc	2012-08-15 15:17:32 +0000
@@ -45,6 +45,10 @@
 #include "StatCounters.h"
 #include "Store.h"
 
+#if HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
 #define WHOIS_PORT 43
 
 class WhoisState

=== modified file 'test-suite/test_tools.cc'
--- test-suite/test_tools.cc	2012-08-14 11:53:07 +0000
+++ test-suite/test_tools.cc	2012-08-15 15:17:32 +0000
@@ -7,6 +7,7 @@
 
 #include "squid.h"
 #include "dlink.h"
+#include <iostream>
 
 void
 xassert(const char *msg, const char *file, int line)