You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/05/17 18:39:23 UTC
svn commit: r945234 - in /trafficserver/traffic/trunk/proxy: StatAPITypes.cc
StatSystemV2.cc mgmt2/tools/Makefile.am mgmt2/tools/NetConfig.cc
Author: georgep
Date: Mon May 17 16:39:23 2010
New Revision: 945234
URL: http://svn.apache.org/viewvc?rev=945234&view=rev
Log:
Fix compilation issues on OSX, FreeBSD and OpenSolaris related to TS-157 and Layout API changes.
Modified:
trafficserver/traffic/trunk/proxy/StatAPITypes.cc
trafficserver/traffic/trunk/proxy/StatSystemV2.cc
trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
Modified: trafficserver/traffic/trunk/proxy/StatAPITypes.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatAPITypes.cc?rev=945234&r1=945233&r2=945234&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatAPITypes.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatAPITypes.cc Mon May 17 16:39:23 2010
@@ -26,6 +26,7 @@
***************************************************************************/
+#include "ink_config.h"
#include "api/ts/ts.h"
#include "StatAPITypes.h"
#include "StatSystemV2.h"
Modified: trafficserver/traffic/trunk/proxy/StatSystemV2.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystemV2.cc?rev=945234&r1=945233&r2=945234&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystemV2.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatSystemV2.cc Mon May 17 16:39:23 2010
@@ -21,6 +21,7 @@
limitations under the License.
*/
+#include "ink_config.h"
#include "StatSystemV2.h"
#include "P_EventSystem.h"
#include "Log.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am?rev=945234&r1=945233&r2=945234&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/Makefile.am Mon May 17 16:39:23 2010
@@ -41,19 +41,23 @@ noinst_LIBRARIES = libinksysapi.a libink
traffic_vip_config_SOURCES = VIPConfig.cc
traffic_vip_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_vip_config_LDADD = \
- $(top_builddir)/libinktomi++/libinktomi++.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/libinktomi++/libinktomi++.a \
@LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
traffic_net_config_SOURCES = NetConfig.cc
traffic_net_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_net_config_LDADD = \
- $(top_builddir)/libinktomi++/libinktomi++.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/libinktomi++/libinktomi++.a \
@LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBEXECINFO@
traffic_time_config_SOURCES = TimeConfig.cc
traffic_time_config_LDFLAGS = @EXTRA_CXX_LDFLAGS@
+traffic_time_config_LDADD = \
+ $(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/libinktomi++/libinktomi++.a \
+ @LIBSOCKET@ @LIBTCL@ @LIBRT@ @LIBICONV@ @LIBEXECINFO@
traffic_shmem_clean_SOURCES = ShmemClean.cc
traffic_shmem_clean_LDFLAGS = @EXTRA_CXX_LDFLAGS@
@@ -61,8 +65,8 @@ traffic_shmem_clean_LDFLAGS = @EXTRA_CXX
traffic_mcast_snoop_SOURCES = McastSnoop.cc
traffic_mcast_snoop_LDFLAGS = @EXTRA_CXX_LDFLAGS@
traffic_mcast_snoop_LDADD = \
- $(top_builddir)/libinktomi++/libinktomi++.a \
$(top_builddir)/iocore/utils/libinkutils.a \
+ $(top_builddir)/libinktomi++/libinktomi++.a \
@LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBTHREAD@ @LIBDL@ @LIBICONV@ @LIBEXECINFO@
libinksysapi_a_SOURCES = SysAPI.cc SysAPI.h
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc?rev=945234&r1=945233&r2=945234&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/NetConfig.cc Mon May 17 16:39:23 2010
@@ -1568,8 +1568,10 @@ struct ifafilt;
#include<string.h>
#include<sys/types.h>
+#include "inktomi++.h"
#include "ink_bool.h"
#include "ink_string.h"
+#include "I_Layout.h"
#define UP_INTERFACE 0
#define DOWN_INTERFACE 1