From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 29 Jun 2013 08:16:04 +0000 (-0600)
Subject: Bug 3854: pt1: compile errors on AIX
X-Git-Tag: SQUID_3_3_6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dded390e24a3d53702bb3fe160b5cd6d289bb374;p=thirdparty%2Fsquid.git

Bug 3854: pt1: compile errors on AIX
---

diff --git a/compat/os/aix.h b/compat/os/aix.h
index 079194ae8a..6a62c4ce6d 100644
--- a/compat/os/aix.h
+++ b/compat/os/aix.h
@@ -17,5 +17,10 @@
 #define _XOPEN_SOURCE_EXTENDED 1
 #endif
 
+/* AIX 6.1 does not define recvmsg() flag MSG_DONTWAIT */
+#if !defined(MSG_DONTWAIT)
+#define MSG_DONTWAIT 0
+#endif
+
 #endif /* _SQUID_AIX_ */
 #endif /* SQUID_OS_AIX_H */
diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index 1c75587051..35b0f48ebd 100644
--- a/tools/squidclient.cc
+++ b/tools/squidclient.cc
@@ -145,6 +145,13 @@ static struct stat sb;
 int total_bytes = 0;
 int io_timeout = 120;
 
+#if _SQUID_AIX_
+/* Bug 3854: AIX 6.1 tries to link in this fde.h global symbol
+ * despite squidclient not using any of the fd_* code.
+ */
+fde *fde::Table = NULL;
+#endif
+
 #if _SQUID_WINDOWS_
 void
 Win32SockCleanup(void)