Bug 3854: pt3: redo pt2 fix and revert rev.12587

The fix in rev.12857 works for Unix and Linux systems. But BSD based
systems it results in TextException errors via sub-includes from the stub

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4c4339f33991fd2d36474ece4e417e9e2e18f05a..a22e37b397df3fed863ad535ada1e6c37b8e07f3 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -34,9 +34,6 @@ test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
        cp $(top_srcdir)/src/tests/stub_debug.cc .
 
-stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc
-       cp $(top_srcdir)/src/tests/stub_fd.cc .
-
 time.cc: $(top_srcdir)/src/time.cc
        cp $(top_srcdir)/src/time.cc .
 
@@ -45,7 +42,7 @@ time.cc: $(top_srcdir)/src/time.cc
 # globals.cc is needed by test_tools.cc.
 # Neither of these should be disted from here.
 TESTSOURCES= test_tools.cc
-CLEANFILES += test_tools.cc stub_debug.cc stub_fd.cc time.cc
+CLEANFILES += test_tools.cc stub_debug.cc time.cc
 
 ## ##### helper-mux #####
 
@@ -61,7 +58,6 @@ bin_PROGRAMS = squidclient
 
 squidclient_SOURCES = squidclient.cc \
        stub_debug.cc \
-       stub_fd.cc \
        test_tools.cc \
        time.cc
 

diff --git a/tools/squidclient.cc b/tools/squidclient.cc
index 5f06555dcf11b99147f95abd7e12c6f8bc9da6cf..8f0e5ade0b02dc224c6c2c24f30fe8a1a6e5061b 100644 (file)
--- 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)