You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ar...@apache.org on 2013/06/14 23:25:27 UTC
git commit: Fix compilation problem on kfreebsd,
this should not affect other architectures
Updated Branches:
refs/heads/master e768cb61c -> 1cc22d69f
Fix compilation problem on kfreebsd, this should not affect other architectures
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1cc22d69
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1cc22d69
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1cc22d69
Branch: refs/heads/master
Commit: 1cc22d69fce5e641cd72e1cb12911734add02ae1
Parents: e768cb6
Author: Arno Töll <ar...@debian.org>
Authored: Fri Jun 14 22:07:38 2013 +0200
Committer: Arno Töll <ar...@debian.org>
Committed: Fri Jun 14 22:07:38 2013 +0200
----------------------------------------------------------------------
cop/TrafficCop.cc | 2 +-
plugins/experimental/tcp_info/tcp_info.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cc22d69/cop/TrafficCop.cc
----------------------------------------------------------------------
diff --git a/cop/TrafficCop.cc b/cop/TrafficCop.cc
index fd383c6..bdac1ec 100644
--- a/cop/TrafficCop.cc
+++ b/cop/TrafficCop.cc
@@ -32,7 +32,6 @@
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
-#include <grp.h>
union semun
{
@@ -42,6 +41,7 @@ union semun
struct seminfo *__buf; /* buffer for IPC_INFO */
};
#endif // linux check
+#include <grp.h>
static const long MAX_LOGIN = sysconf(_SC_LOGIN_NAME_MAX) <= 0 ? _POSIX_LOGIN_NAME_MAX : sysconf(_SC_LOGIN_NAME_MAX);
static const char COP_TRACE_FILE[] = "/tmp/traffic_cop.trace";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1cc22d69/plugins/experimental/tcp_info/tcp_info.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/tcp_info/tcp_info.cc b/plugins/experimental/tcp_info/tcp_info.cc
index c261467..193d671 100644
--- a/plugins/experimental/tcp_info/tcp_info.cc
+++ b/plugins/experimental/tcp_info/tcp_info.cc
@@ -116,7 +116,7 @@ log_tcp_info(const char* event_name, const char* client_ip, const char* server_i
int bytes = 0;
if (config.log_level == 2) {
-#if !defined(freebsd)
+#if !defined(freebsd) || defined(__GLIBC__)
bytes = snprintf(buffer, sizeof(buffer), "%s %u %u %s %s %u %u %u %u %u %u %u %u %u %u %u %u\n",
event_name,
(uint32_t)now.tv_sec,