diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/graphics/WOFFFileFormat.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/graphics/WOFFFileFormat.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/WOFFFileFormat.cpp | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/Source/WebCore/platform/graphics/WOFFFileFormat.cpp b/Source/WebCore/platform/graphics/WOFFFileFormat.cpp index d9a9e6e42..b9a91730b 100644 --- a/Source/WebCore/platform/graphics/WOFFFileFormat.cpp +++ b/Source/WebCore/platform/graphics/WOFFFileFormat.cpp @@ -30,30 +30,7 @@ #if !USE(OPENTYPE_SANITIZER) #include "SharedBuffer.h" - -#if OS(UNIX) -#include <netinet/in.h> -#endif - -#if OS(WINDOWS) -#if CPU(BIG_ENDIAN) -#define ntohs(x) ((uint16_t)(x)) -#define htons(x) ((uint16_t)(x)) -#define ntohl(x) ((uint32_t)(x)) -#define htonl(x) ((uint32_t)(x)) -#elif CPU(MIDDLE_ENDIAN) -#define ntohs(x) ((unit16_t)(x)) -#define htons(x) ((uint16_t)(x)) -#define ntohl(x) ((uint32_t)((((uint32_t)(x) & 0xffff0000) >> 16) | (((uint32_t)(x) & 0xffff) << 16)) -#define htonl(x) ntohl(x) -#else -#define ntohs(x) ((uint16_t)((((uint16_t)(x) & 0xff00) >> 8) | (((uint16_t)(x) & 0x00ff) << 8))) -#define htons(x) ntohs(x) -#define ntohl(x) ((uint32_t)((((uint32_t)(x) & 0xff000000) >> 24) | (((uint32_t)(x) & 0x00ff0000) >> 8) | \ - (((uint32_t)(x) & 0x0000ff00) << 8) | (((uint32_t)(x) & 0x000000ff) << 24))) -#define htonl(x) ntohl(x) -#endif -#endif // OS(WINDOWS) +#include <wtf/ByteOrder.h> namespace WebCore { |