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

paroga at webkit.org paroga at webkit.org
Wed Dec 22 13:54:49 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e41344b84e7f3141e20b27d646d434abe7b79025
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 15:55:42 2010 +0000

    2010-09-29  Patrick Gansterer  <paroga at webkit.org>
    
            Unreviewed.
    
            Next try to fix cygwin build.
    
            * wtf/Assertions.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 76ea4c1..bbdf703 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,14 @@
 
         Unreviewed.
 
+        Next try to fix cygwin build.
+
+        * wtf/Assertions.cpp:
+
+2010-09-29  Patrick Gansterer  <paroga at webkit.org>
+
+        Unreviewed.
+
         Build fix for cygwin #2. It's OS(WINDOWS), not OS(WIN).
 
         * wtf/Assertions.cpp:
diff --git a/JavaScriptCore/wtf/Assertions.cpp b/JavaScriptCore/wtf/Assertions.cpp
index 02a9c87..9222c1d 100644
--- a/JavaScriptCore/wtf/Assertions.cpp
+++ b/JavaScriptCore/wtf/Assertions.cpp
@@ -42,12 +42,11 @@
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
-#include <windows.h>
 #include <crtdbg.h>
 #endif
 
 #if OS(WINDOWS)
-#include <winbase.h>
+#include <windows.h>
 #endif
 
 #if PLATFORM(BREWMP)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list