You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/03/09 01:48:37 UTC
[18/50] git commit: TS-1727: Make spdy compile on Solaris and Illumos
TS-1727: Make spdy compile on Solaris and Illumos
I'm not really happy with this.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9af6d5c8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9af6d5c8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9af6d5c8
Branch: refs/heads/3.3.x
Commit: 9af6d5c8fd801c5d3e09d2895a5e2129758523d2
Parents: 4be5750
Author: Igor Galić <i....@brainsware.org>
Authored: Wed Feb 27 13:26:46 2013 -0800
Committer: Igor Galić <i....@brainsware.org>
Committed: Wed Feb 27 13:26:46 2013 -0800
----------------------------------------------------------------------
plugins/experimental/spdy/protocol.cc | 3 +++
plugins/experimental/spdy/spdy.cc | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9af6d5c8/plugins/experimental/spdy/protocol.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/spdy/protocol.cc b/plugins/experimental/spdy/protocol.cc
index 219af5b..ab06ea5 100644
--- a/plugins/experimental/spdy/protocol.cc
+++ b/plugins/experimental/spdy/protocol.cc
@@ -27,6 +27,9 @@
#include <algorithm>
#include <vector>
#include <sys/param.h> // MAX
+#if !defined(MAX)
+# define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
void
spdy_send_reset_stream(
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9af6d5c8/plugins/experimental/spdy/spdy.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/spdy/spdy.cc b/plugins/experimental/spdy/spdy.cc
index 7035789..9e88058 100644
--- a/plugins/experimental/spdy/spdy.cc
+++ b/plugins/experimental/spdy/spdy.cc
@@ -341,7 +341,7 @@ extern "C" void
TSPluginInit(int argc, const char * argv[])
{
static const struct option longopts[] = {
- { "system-resolver", no_argument, NULL, 's' },
+ { const_cast<char *>("system-resolver"), no_argument, NULL, 's' },
{ NULL, 0, NULL, 0 }
};