trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject git commit: TS-1683: channel_stats doesn't compile under fBSD
Date Tue, 05 Feb 2013 11:13:16 GMT
Updated Branches:
  refs/heads/master 088edc4ab -> adc95534f


TS-1683: channel_stats doesn't compile under fBSD

We use the *right* include file this time around.
We also make a predesence for using ink_platform.h in a plugin.

This file should be installed to make plugin developers lives easier.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/adc95534
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/adc95534
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/adc95534

Branch: refs/heads/master
Commit: adc95534fbe54ba4b5c7b7adeddcdd058fc5cd8c
Parents: 088edc4
Author: Igor Galić <i.galic@brainsware.org>
Authored: Tue Feb 5 12:10:52 2013 +0100
Committer: Igor Galić <i.galic@brainsware.org>
Committed: Tue Feb 5 12:10:52 2013 +0100

----------------------------------------------------------------------
 plugins/experimental/channel_stats/Makefile.am     |    2 +-
 .../experimental/channel_stats/channel_stats.cc    |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/adc95534/plugins/experimental/channel_stats/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/Makefile.am b/plugins/experimental/channel_stats/Makefile.am
index 368f853..e8f9a06 100644
--- a/plugins/experimental/channel_stats/Makefile.am
+++ b/plugins/experimental/channel_stats/Makefile.am
@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api
+AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api -I$(top_srcdir)/lib
 
 pkglibdir = ${pkglibexecdir}
 pkglib_LTLIBRARIES = channel_stats.la

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/adc95534/plugins/experimental/channel_stats/channel_stats.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/channel_stats.cc b/plugins/experimental/channel_stats/channel_stats.cc
index f401ef1..1499a78 100644
--- a/plugins/experimental/channel_stats/channel_stats.cc
+++ b/plugins/experimental/channel_stats/channel_stats.cc
@@ -16,6 +16,8 @@
   limitations under the License.
 */
 
+# include "ts/ink_platform.h"
+
 // get INT64_MAX
 #define __STDC_LIMIT_MACROS
 
@@ -28,8 +30,8 @@
 #include <algorithm>
 #include <sstream>
 #include <arpa/inet.h>
-#if defined(TS_HAVE_NETINET_IN_H)
-#include <inet/in.h>
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
 #endif
 
 #include <ts/ts.h>


Mime
View raw message