Author: bryanduxbury
Date: Mon Aug 16 17:08:03 2010
New Revision: 986051
URL: http://svn.apache.org/viewvc?rev=986051&view=rev
Log:
revert THRIFT-682, since it doesn't build anywhere, apparently.
Modified:
incubator/thrift/branches/0.4.x/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
Modified:
incubator/thrift/branches/0.4.x/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
URL:
http://svn.apache.org/viewvc/incubator/thrift/branches/0.4.x/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp?rev=986051&r1=986050&r2=986051&view=diff
==============================================================================
---
incubator/thrift/branches/0.4.x/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
(original)
+++
incubator/thrift/branches/0.4.x/lib/php/src/ext/thrift_protocol/php_thrift_protocol.cpp
Mon Aug 16 17:08:03 2010
@@ -24,23 +24,10 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <unistd.h>
-#include <machine/endian.h>
-#include <machine/byte_order.h>
+#include <endian.h>
+#include <byteswap.h>
#include <stdexcept>
-#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)
