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

[adachan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit fa36f5c8a5f5074d4b6b4fb06ff9104e9522e67c
Author: adachan at apple.com <adachan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 14 19:47:32 2010 +0000

            Rubber-stamped by Adam Roben.
    
            Fix Windows build.
    
            * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
            * win/lib/WebKitSystemInterface.lib:
            * win/lib/WebKitSystemInterface_debug.lib:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69797 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index c493680..f99f6bd 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,5 +1,15 @@
 2010-10-14  Ada Chan  <adachan at apple.com>
 
+        Rubber-stamped by Adam Roben.
+
+        Fix Windows build.
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+        * win/lib/WebKitSystemInterface_debug.lib:
+
+2010-10-14  Ada Chan  <adachan at apple.com>
+
         Reviewed by Steve Falkenburg.
 
         Add wkGetSSLCertificateChainContext for fetching the certificate chain.
diff --git a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
index 427b257..676ef14 100644
--- a/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
+++ b/WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
@@ -127,10 +127,18 @@ typedef enum {
     WKMediaControllerFlagFocused = 1 << 4
 } WKMediaControllerThemeState;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool WKMediaControllerThemeAvailable(int themeStyle);
 bool WKHitTestMediaUIPart(int part, int themeStyle, CGRect bounds, CGPoint point);
 void WKMeasureMediaUIPart(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
 void WKDrawMediaUIPart(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
 void WKDrawMediaSliderTrack(int themeStyle, CGContextRef context, CGRect rect, float timeLoaded, float currentTime, float duration, unsigned state);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // WebKitSystemInterface_h
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface.lib b/WebKitLibraries/win/lib/WebKitSystemInterface.lib
index 2128d6c..a52d9c2 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ
diff --git a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib
index 05f044f..2b0dea5 100644
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface_debug.lib differ

-- 
WebKit Debian packaging