From 0c4f88a9533ac99d8101fb97f9b22f0d5c22cb9a Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Mon, 16 Aug 2010 17:08:03 +0000 Subject: [PATCH] revert THRIFT-682, since it doesn't build anywhere, apparently. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/branches/0.4.x@986051 13f79535-47bb-0310-9956-ffa450edef68 --- .../ext/thrift_protocol/php_thrift_protocol.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp b/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp index 193669bb..641fff2e 100644 --- a/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp +++ b/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp @@ -24,23 +24,10 @@ #include #include #include -#include -#include +#include +#include #include -#ifndef _BYTESWAP_H -#define _BYTESWAP_H - -#define bswap_64(x) (((uint64_t)(x) << 56) | \ - (((uint64_t)(x) << 40) & 0xff000000000000ULL) | \ - (((uint64_t)(x) << 24) & 0xff0000000000ULL) | \ - (((uint64_t)(x) << 8) & 0xff00000000ULL) | \ - (((uint64_t)(x) >> 8) & 0xff000000ULL) | \ - (((uint64_t)(x) >> 24) & 0xff0000ULL) | \ - (((uint64_t)(x) >> 40) & 0xff00ULL) | \ - ((uint64_t)(x) >> 56)) -#endif - #if __BYTE_ORDER == __LITTLE_ENDIAN #define htonll(x) bswap_64(x) #define ntohll(x) bswap_64(x) -- 2.17.1