----- Original Message ----- > TS-2082: remove NON_MODULAR define > > > Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo > Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5140b18d > Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5140b18d > Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5140b18d > > Branch: refs/heads/master > Commit: 5140b18d0c15be1b532edab8c92b00b7c862324f > Parents: 51ce9ae > Author: Zhao Yongming <ming....@gmail.com> > Authored: Thu Nov 7 18:53:14 2013 +0800 > Committer: Zhao Yongming <ming....@gmail.com> > Committed: Sat Dec 7 14:30:19 2013 +0800
[snip] > http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5140b18d/iocore/cluster/ClusterAPI.cc > ---------------------------------------------------------------------- > diff --git a/iocore/cluster/ClusterAPI.cc b/iocore/cluster/ClusterAPI.cc > index fab80dc..3600022 100644 > --- a/iocore/cluster/ClusterAPI.cc > +++ b/iocore/cluster/ClusterAPI.cc > @@ -30,7 +30,6 @@ > ****************************************************************************/ > #include "P_Cluster.h" > > -#ifdef NON_MODULAR > #include "InkAPIInternal.h" > > class ClusterAPIPeriodicSM; > @@ -278,11 +277,6 @@ void > clusterAPI_init() > { > MachineStatusSM *mssmp = 0; > - // XXX: BIG RED WARNING!!! Direct null pointer dereference > - // Either create MachineStatusSM before ose or axe this function. > - // It is used only if NON_MODULAR is defined making that > - // flag crashing ClusterProcessor::init() > - // This Warning no longer applies? > ink_atomiclist_init(&status_callout_atomic_q, > "cluster API status_callout_q", (char *) > &mssmp->link.next - (char *) mssmp); > ClusterAPI_mutex = new_ProxyMutex(); > @@ -580,7 +574,6 @@ TSSendClusterRPC(TSNodeHandle_t * nh, TSClusterRPCMsg_t * > msg) > > return 0; > } > -#endif /* NON_MODULAR */ > > /* > * End of ClusterAPI.cc > -- 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
