Repository: thrift
Updated Branches:
  refs/heads/master 446a319f9 -> 9dfe7b83e


THRIFT-2474 complete the ntohll precompile conditionals


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

Branch: refs/heads/master
Commit: 9dfe7b83efff9e3b1aec0cdcdb7bfb869c40fbfa
Parents: 446a319
Author: Jim King <[email protected]>
Authored: Wed May 6 09:51:54 2015 -0400
Committer: Roger Meier <[email protected]>
Committed: Sat May 9 23:45:33 2015 +0200

----------------------------------------------------------------------
 lib/cpp/src/thrift/protocol/TProtocol.h | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/9dfe7b83/lib/cpp/src/thrift/protocol/TProtocol.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h 
b/lib/cpp/src/thrift/protocol/TProtocol.h
index f220d5c..f3b6048 100644
--- a/lib/cpp/src/thrift/protocol/TProtocol.h
+++ b/lib/cpp/src/thrift/protocol/TProtocol.h
@@ -97,8 +97,10 @@ static inline To bitwise_cast(From from) {
 #endif
 
 #if __THRIFT_BYTE_ORDER == __THRIFT_BIG_ENDIAN
+# if !defined(ntohll)
 #  define ntohll(n) (n)
 #  define htonll(n) (n)
+# endif
 # if defined(__GNUC__) && defined(__GLIBC__)
 #  include <byteswap.h>
 #  define htolell(n) bswap_64(n)

Reply via email to