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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 16:17:06 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 3c79c1ea84ebed3c06efa522b93310348fdb5a9f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 21 00:27:23 2010 +0000

    2010-11-20  Kwang Yul Seo  <skyul at company100.net>
    
            Reviewed by David Kilzer.
    
            [BREWMP] Replace HTONL, HTONS, NTOHL and NTOHS with byte order conversion functions from AEEstd.h
            https://bugs.webkit.org/show_bug.cgi?id=49518
    
            HTONL, HTONS, NTOHL and NTOHS macros are prohibited in Mod1. Use byte order conversion functions provided by AEEstd.h.
    
            * platform/graphics/WOFFFileFormat.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d16b676..47855ae 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by David Kilzer.
 
+        [BREWMP] Replace HTONL, HTONS, NTOHL and NTOHS with byte order conversion functions from AEEstd.h
+        https://bugs.webkit.org/show_bug.cgi?id=49518
+
+        HTONL, HTONS, NTOHL and NTOHS macros are prohibited in Mod1. Use byte order conversion functions provided by AEEstd.h.
+
+        * platform/graphics/WOFFFileFormat.cpp:
+
+2010-11-20  Kwang Yul Seo  <skyul at company100.net>
+
+        Reviewed by David Kilzer.
+
         [BREWMP] Use std_wstrlen instead of WSTRLEN
         https://bugs.webkit.org/show_bug.cgi?id=49516
 
diff --git a/WebCore/platform/graphics/WOFFFileFormat.cpp b/WebCore/platform/graphics/WOFFFileFormat.cpp
index 5391f30..b1400ba 100644
--- a/WebCore/platform/graphics/WOFFFileFormat.cpp
+++ b/WebCore/platform/graphics/WOFFFileFormat.cpp
@@ -36,11 +36,11 @@
 #endif
 
 #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)
+#include <AEEstd.h>
+#define htonl(x) std_htonl(x)
+#define htons(x) std_htons(x)
+#define ntohl(x) std_ntohl(x)
+#define ntohs(x) std_ntohs(x)
 #endif
 
 #if PLATFORM(WIN)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list