------------------------------------------------------------ revno: 12364 revision-id: squid3@treenet.co.nz-20121016234132-e3wjkgbfhdscydei parent: squid3@treenet.co.nz-20121016234001-sh9frwo38p21n9p2 author: Francesco Chemolli committer: Amos Jeffries branch nick: 3.3 timestamp: Tue 2012-10-16 17:41:32 -0600 message: Fix linking issues in testDiskIO and testStatHist ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20121016234132-e3wjkgbfhdscydei # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: a0228e545a74100fe22a9449679de880d3a1aabf # timestamp: 2012-10-16 23:44:13 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121016234001-\ # sh9frwo38p21n9p2 # # Begin patch === modified file 'src/Makefile.am' --- src/Makefile.am 2012-10-05 15:56:08 +0000 +++ src/Makefile.am 2012-10-16 23:41:32 +0000 @@ -1700,6 +1700,7 @@ tests/stub_cache_cf.cc \ tests/stub_cache_manager.cc \ tests/stub_client_db.cc \ + client_side_request.h \ tests/stub_client_side_request.cc \ tests/stub_debug.cc \ tests/stub_errorpage.cc \ @@ -3951,6 +3952,7 @@ tests_testStatHist_LDADD = \ base/libbase.la \ $(top_builddir)/lib/libmiscutil.la \ + $(top_builddir)/lib/libmisccontainers.la \ $(SQUID_CPPUNIT_LIBS) \ $(SQUID_CPPUNIT_LA) \ $(COMPAT_LIB) === modified file 'src/tests/stub_client_side_request.cc' --- src/tests/stub_client_side_request.cc 2012-09-01 14:38:36 +0000 +++ src/tests/stub_client_side_request.cc 2012-10-16 23:41:32 +0000 @@ -32,3 +32,7 @@ #include "squid.h" #include "client_side_request.h" #include "Store.h" + +#if !_USE_INLINE_ +#include "client_side_request.cci" +#endif