[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c9862b7fec753613d18f9c52cd7aee1998db162e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 07:36:36 2010 +0000

    2010-08-05  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by Kent Tamura.
    
            [BREWMP] Define htonl, htons, ntohl and ntohs
            https://bugs.webkit.org/show_bug.cgi?id=43397
    
            In BREWMP, AEEStdLib.h provides macros for byte order conversion: HTONL, HTONS, NTOHL and NTOHS.
            Use these macros to define htonl, htons, ntohl and ntohs used by WOFFFileFormat.cpp.
    
            * platform/graphics/WOFFFileFormat.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64720 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9824048..7af2785 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-05  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by Kent Tamura.
+
+        [BREWMP] Define htonl, htons, ntohl and ntohs
+        https://bugs.webkit.org/show_bug.cgi?id=43397
+
+        In BREWMP, AEEStdLib.h provides macros for byte order conversion: HTONL, HTONS, NTOHL and NTOHS.
+        Use these macros to define htonl, htons, ntohl and ntohs used by WOFFFileFormat.cpp.
+
+        * platform/graphics/WOFFFileFormat.cpp:
+
 2010-08-04  Zoltan Herczeg  <zherczeg at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/platform/graphics/WOFFFileFormat.cpp b/WebCore/platform/graphics/WOFFFileFormat.cpp
index dc73603..908e288 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -32,6 +32,13 @@
 
 #if !PLATFORM(WIN)
 #include <zlib.h>
+#if PLATFORM(BREWMP)
+#include <AEEStdLib.h>
+#define htonl(x) HTONL(x)
+#define htons(x) HTONS(x)
+#define ntohl(x) NTOHL(x)
+#define ntohs(x) NTOHS(x)
+#endif
 #else
 #include "SoftLinking.h"
 

-- 
WebKit Debian packaging