trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject [trafficserver] branch master updated: TS-5013: master does not build on omnios
Date Thu, 27 Oct 2016 00:37:46 GMT
This is an automated email from the ASF dual-hosted git repository.

jesus pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  fd0ffd4   TS-5013: master does not build on omnios
fd0ffd4 is described below

commit fd0ffd495d855b18da5a820879b1ceef78d0b5e5
Author: Theo Schlossnagle <theo.schlossnagle@circonus.com>
AuthorDate: Wed Oct 26 23:21:56 2016 +0000

    TS-5013: master does not build on omnios
    
     * include termios.h for defines.
     * implement be64toh for example.
---
 example/cppapi/websocket/WSBuffer.cc | 6 ++++++
 iocore/net/UnixNetVConnection.cc     | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/example/cppapi/websocket/WSBuffer.cc b/example/cppapi/websocket/WSBuffer.cc
index ee406a6..035b940 100644
--- a/example/cppapi/websocket/WSBuffer.cc
+++ b/example/cppapi/websocket/WSBuffer.cc
@@ -33,6 +33,12 @@
 #elif defined(__APPLE__)
 #include <libkern/OSByteOrder.h>
 #define be64toh(x) OSSwapBigToHostInt64(x)
+#elif defined(sun) || defined(__sun)
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define be64toh(x) ntohll(x)
+#elif BYTE_ORDER == BIG_ENDIAN
+#define be64toh(x) (x)
+#endif
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <sys/endian.h>
 #elif defined(__DragonFly__)
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index a897c36..1f902ea 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -26,6 +26,8 @@
 #include "ts/InkErrno.h"
 #include "Log.h"
 
+#include <termios.h>
+
 #define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
 #define STATE_FROM_VIO(_x) ((NetState *)(((char *)(_x)) - STATE_VIO_OFFSET))
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].

Mime
View raw message