[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
weinig at apple.com
weinig at apple.com
Tue Jan 5 23:54:10 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 99284b7291daeb493862a367d21d20e8d80041c2
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 18 20:41:23 2009 +0000
Add export the new symbol in WebCoreSystemInterface.
Reviewed by Anders Carlsson.
* WebCore.base.exp:
* platform/mac/WebCoreSystemInterface.h:
* platform/mac/WebCoreSystemInterface.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52331 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e6bff95..d11b438 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
Reviewed by Anders Carlsson.
+ Add export the new symbol in WebCoreSystemInterface.
+
+ * WebCore.base.exp:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
+2009-12-18 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
Forward declare NSMutableArray when not compiling for Objective-C.
* platform/mac/WebCoreSystemInterface.h:
diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index c29629a..f879bd4 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -1044,3 +1044,4 @@ _wkSetUpFontCache
_wkSignalCFReadStreamEnd
_wkSignalCFReadStreamError
_wkSignalCFReadStreamHasBytes
+_wkNoteOpenPanelFiles
diff --git a/WebCore/platform/mac/WebCoreSystemInterface.h b/WebCore/platform/mac/WebCoreSystemInterface.h
index a71624f..28f9946 100644
--- a/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -170,6 +170,8 @@ extern BOOL (*wkUseSharedMediaUI)();
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
extern NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *);
+#else
+extern void* wkNoteOpenPanelFiles;
#endif
#ifdef __cplusplus
diff --git a/WebCore/platform/mac/WebCoreSystemInterface.mm b/WebCore/platform/mac/WebCoreSystemInterface.mm
index c2c21e6..a24eea3 100644
--- a/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -109,4 +109,6 @@ BOOL (*wkSupportsMultipartXMixedReplace)(NSMutableURLRequest *);
#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
NSMutableArray *(*wkNoteOpenPanelFiles)(NSArray *);
+#else
+void* wkNoteOpenPanelFiles;
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list