trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject [29/50] git commit: TS-1858: Fix redefinition of timersub on OmniOS with the ESI plugin.
Date Sat, 04 May 2013 15:30:50 GMT
TS-1858: Fix redefinition of timersub on OmniOS with the ESI plugin.


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

Branch: refs/heads/sphinx-docs
Commit: ddce361ffa08306423f200eba9c03b3a171d8679
Parents: 05fe0f5
Author: Daniel Gruno <humbedooh@apache.org>
Authored: Sun Apr 28 12:43:27 2013 +0200
Committer: Daniel Gruno <humbedooh@apache.org>
Committed: Sun Apr 28 12:43:27 2013 +0200

----------------------------------------------------------------------
 plugins/experimental/esi/lib/FailureInfo.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddce361f/plugins/experimental/esi/lib/FailureInfo.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/FailureInfo.h b/plugins/experimental/esi/lib/FailureInfo.h
index eca99f1..8f4705b 100644
--- a/plugins/experimental/esi/lib/FailureInfo.h
+++ b/plugins/experimental/esi/lib/FailureInfo.h
@@ -27,7 +27,7 @@
 #include <vector>
 #include <map>
 #include <sys/time.h>
-#if defined(solaris)
+#if defined(solaris) && !defined(timersub)
 #define timersub(a, b, result) \
   do { \
     (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \


Mime
View raw message