| Index: third_party/WebKit/Source/wtf/ByteOrder.h
|
| diff --git a/third_party/WebKit/Source/wtf/ByteOrder.h b/third_party/WebKit/Source/wtf/ByteOrder.h
|
| index 38a1ef1805fbccf20a26e66dd1e72b972e902482..35456a828cf5aa7892b33ece7961f03c239be286 100644
|
| --- a/third_party/WebKit/Source/wtf/ByteOrder.h
|
| +++ b/third_party/WebKit/Source/wtf/ByteOrder.h
|
| @@ -41,22 +41,46 @@
|
| #include "wtf/CPU.h"
|
|
|
| #if CPU(BIG_ENDIAN)
|
| -inline uint16_t ntohs(uint16_t x) { return x; }
|
| -inline uint16_t htons(uint16_t x) { return x; }
|
| -inline uint32_t ntohl(uint32_t x) { return x; }
|
| -inline uint32_t htonl(uint32_t x) { return x; }
|
| +inline uint16_t ntohs(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint16_t htons(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint32_t ntohl(uint32_t x) {
|
| + return x;
|
| +}
|
| +inline uint32_t htonl(uint32_t x) {
|
| + return x;
|
| +}
|
| #elif CPU(MIDDLE_ENDIAN)
|
| -inline uint16_t ntohs(uint16_t x) { return x; }
|
| -inline uint16_t htons(uint16_t x) { return x; }
|
| -inline uint32_t ntohl(uint32_t x) { return WTF::wswap32(x); }
|
| -inline uint32_t htonl(uint32_t x) { return WTF::wswap32(x); }
|
| +inline uint16_t ntohs(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint16_t htons(uint16_t x) {
|
| + return x;
|
| +}
|
| +inline uint32_t ntohl(uint32_t x) {
|
| + return WTF::wswap32(x);
|
| +}
|
| +inline uint32_t htonl(uint32_t x) {
|
| + return WTF::wswap32(x);
|
| +}
|
| #else
|
| -inline uint16_t ntohs(uint16_t x) { return WTF::bswap16(x); }
|
| -inline uint16_t htons(uint16_t x) { return WTF::bswap16(x); }
|
| -inline uint32_t ntohl(uint32_t x) { return WTF::bswap32(x); }
|
| -inline uint32_t htonl(uint32_t x) { return WTF::bswap32(x); }
|
| +inline uint16_t ntohs(uint16_t x) {
|
| + return WTF::bswap16(x);
|
| +}
|
| +inline uint16_t htons(uint16_t x) {
|
| + return WTF::bswap16(x);
|
| +}
|
| +inline uint32_t ntohl(uint32_t x) {
|
| + return WTF::bswap32(x);
|
| +}
|
| +inline uint32_t htonl(uint32_t x) {
|
| + return WTF::bswap32(x);
|
| +}
|
| #endif
|
|
|
| -#endif // OS(WIN)
|
| +#endif // OS(WIN)
|
|
|
| -#endif // WTF_ByteOrder_h
|
| +#endif // WTF_ByteOrder_h
|
|
|