----- Original Message ----- > TS-2082: fix build with --enable-standalone-iocore > > before we remove that completely, get it work fist. > > > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo > Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/94215bf2 > Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/94215bf2 > Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/94215bf2 > > Branch: refs/heads/master > Commit: 94215bf293d76d27a88a0fc9e35356321310fbf5 > Parents: 1577c71 > Author: Zhao Yongming <ming....@gmail.com> > Authored: Mon Nov 4 23:33:16 2013 +0800 > Committer: Zhao Yongming <ming....@gmail.com> > Committed: Thu Nov 7 11:35:31 2013 +0800 > > ---------------------------------------------------------------------- > CHANGES | 2 ++ > iocore/cache/Cache.cc | 30 +++++++++++++-------------- > iocore/cache/CacheHttp.cc | 16 +++++++------- > iocore/cache/CacheRead.cc | 10 ++++++++- > iocore/cache/CacheWrite.cc | 4 ++++ > iocore/cache/I_CacheDefs.h | 2 +- > iocore/cache/Makefile.am | 3 +++ > iocore/cache/P_CacheInternal.h | 11 +++++----- > iocore/dns/DNS.cc | 3 ++- > iocore/dns/Makefile.am | 4 ++++ > iocore/dns/P_DNSProcessor.h | 26 +++++++++++++++++++++++ > iocore/dns/P_SplitDNSProcessor.h | 27 ------------------------ > iocore/hostdb/HostDB.cc | 2 +- > iocore/hostdb/Makefile.am | 3 +++ > iocore/hostdb/MultiCache.cc | 1 + > iocore/net/Makefile.am | 4 ++++ > iocore/net/Socks.cc | 2 +- > lib/records/RecMessage.cc | 6 ++++-- > proxy/Initialize.cc | 39 +++++++++++++++++++++++++++++++---- > proxy/Initialize.h | 2 +- > proxy/shared/UglyLogStubs.cc | 1 + > 21 files changed, 129 insertions(+), 69 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/94215bf2/CHANGES > ---------------------------------------------------------------------- > diff --git a/CHANGES b/CHANGES > index d0a6d6c..bfbbc10 100644 > --- a/CHANGES > +++ b/CHANGES > @@ -2,6 +2,8 @@ > Changes with Apache Traffic Server 4.2.0 > > > + *) [TS-2082] fix build with --enable-standalone-iocore. > + > *) [TS-2712] Explicitly use subdir-objects in automake init. > > *) [TS-2309] Allow mod_generator plugin for lighttpd to accept "SI" > postfixes. > > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/94215bf2/iocore/cache/Cache.cc > ---------------------------------------------------------------------- > diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc > index e903a90..da63ec4 100644 > --- a/iocore/cache/Cache.cc > +++ b/iocore/cache/Cache.cc > @@ -123,20 +123,6 @@ CacheKey zero_key(0, 0); > #if TS_USE_INTERIM_CACHE == 1 > ClassAllocator<MigrateToInterimCache> > migrateToInterimCacheAllocator("migrateToInterimCache"); > #endif > -void verify_cache_api() { > - ink_assert((int)TS_EVENT_CACHE_OPEN_READ == (int)CACHE_EVENT_OPEN_READ); > - ink_assert((int)TS_EVENT_CACHE_OPEN_READ_FAILED == > (int)CACHE_EVENT_OPEN_READ_FAILED); > - ink_assert((int)TS_EVENT_CACHE_OPEN_WRITE == (int)CACHE_EVENT_OPEN_WRITE); > - ink_assert((int)TS_EVENT_CACHE_OPEN_WRITE_FAILED == > (int)CACHE_EVENT_OPEN_WRITE_FAILED); > - ink_assert((int)TS_EVENT_CACHE_REMOVE == (int)CACHE_EVENT_REMOVE); > - ink_assert((int)TS_EVENT_CACHE_REMOVE_FAILED == > (int)CACHE_EVENT_REMOVE_FAILED); > - ink_assert((int)TS_EVENT_CACHE_SCAN == (int)CACHE_EVENT_SCAN); > - ink_assert((int)TS_EVENT_CACHE_SCAN_FAILED == > (int)CACHE_EVENT_SCAN_FAILED); > - ink_assert((int)TS_EVENT_CACHE_SCAN_OBJECT == > (int)CACHE_EVENT_SCAN_OBJECT); > - ink_assert((int)TS_EVENT_CACHE_SCAN_OPERATION_BLOCKED == > (int)CACHE_EVENT_SCAN_OPERATION_BLOCKED); > - ink_assert((int)TS_EVENT_CACHE_SCAN_OPERATION_FAILED == > (int)CACHE_EVENT_SCAN_OPERATION_FAILED); > - ink_assert((int)TS_EVENT_CACHE_SCAN_DONE == (int)CACHE_EVENT_SCAN_DONE); > -} > > struct VolInitInfo > { > @@ -220,7 +206,6 @@ ConfigVolumes config_volumes; > > #if TS_HAS_TESTS > void force_link_CacheTestCaller() { > - force_link_CacheTest(); > } > #endif > > @@ -309,12 +294,14 @@ > CacheVC::CacheVC():alternate_index(CACHE_ALT_INDEX_DEFAULT) > //coverity[uninit_member] > } > > +#ifdef HTTP_CACHE > HTTPInfo::FragOffset* > CacheVC::get_frag_table() > { > ink_assert(alternate.valid()); > return alternate.valid() ? alternate.get_frag_table() : 0; > } > +#endif
huh?! When is that /not/ the case? [snip] ++ i Igor Galić Tel: +43 (0) 664 886 22 883 Mail: i.ga...@brainsware.org URL: http://brainsware.org/ GPG: 8716 7A9F 989B ABD5 100F 4008 F266 55D6 2998 1641
