Title: [112558] trunk/Source/WTF
- Revision
- 112558
- Author
- [email protected]
- Date
- 2012-03-29 12:22:02 -0700 (Thu, 29 Mar 2012)
Log Message
[wx] Unreviewed build fix. Add WTF_EXPORT_PRIVATE_NO_RTTI
so that ports not using RTTI can add symbol exports to
classes that RTTI ports export with WTF_EXPORT_PRIVATE_RTTI.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (112557 => 112558)
--- trunk/Source/WTF/ChangeLog 2012-03-29 19:09:00 UTC (rev 112557)
+++ trunk/Source/WTF/ChangeLog 2012-03-29 19:22:02 UTC (rev 112558)
@@ -1,3 +1,12 @@
+2012-03-29 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Add WTF_EXPORT_PRIVATE_NO_RTTI
+ so that ports not using RTTI can add symbol exports to
+ classes that RTTI ports export with WTF_EXPORT_PRIVATE_RTTI.
+
+ * wtf/ArrayBufferView.h:
+ * wtf/ExportMacros.h:
+
2012-03-29 Caio Marcelo de Oliveira Filho <[email protected]>
HashMap<>::add should return a more descriptive object
Modified: trunk/Source/WTF/wtf/ArrayBufferView.h (112557 => 112558)
--- trunk/Source/WTF/wtf/ArrayBufferView.h 2012-03-29 19:09:00 UTC (rev 112557)
+++ trunk/Source/WTF/wtf/ArrayBufferView.h 2012-03-29 19:22:02 UTC (rev 112558)
@@ -66,10 +66,10 @@
virtual unsigned byteLength() const = 0;
- WTF_EXPORT_PRIVATE virtual ~ArrayBufferView();
+ WTF_EXPORT_PRIVATE_NO_RTTI virtual ~ArrayBufferView();
protected:
- WTF_EXPORT_PRIVATE ArrayBufferView(PassRefPtr<ArrayBuffer>, unsigned byteOffset);
+ WTF_EXPORT_PRIVATE_NO_RTTI ArrayBufferView(PassRefPtr<ArrayBuffer>, unsigned byteOffset);
inline bool setImpl(ArrayBufferView*, unsigned byteOffset);
@@ -119,7 +119,7 @@
*numElements = std::min(remainingElements, *numElements);
}
- WTF_EXPORT_PRIVATE virtual void neuter();
+ WTF_EXPORT_PRIVATE_NO_RTTI virtual void neuter();
// This is the address of the ArrayBuffer's storage, plus the byte offset.
void* m_baseAddress;
Modified: trunk/Source/WTF/wtf/ExportMacros.h (112557 => 112558)
--- trunk/Source/WTF/wtf/ExportMacros.h 2012-03-29 19:09:00 UTC (rev 112557)
+++ trunk/Source/WTF/wtf/ExportMacros.h 2012-03-29 19:22:02 UTC (rev 112558)
@@ -49,9 +49,14 @@
#define WTF_HIDDEN
#endif
+// Currently WTF is embedded statically in JSCore, which exports
+// WTF symbols in the JSCore shared library.
+// Because of this, we need to make sure that we use WTF_EXPORT
+// when building _javascript_Core as well as WTF.
+
// FIXME: When all ports are using the export macros, we should replace
// WTF_EXPORTDATA with WTF_EXPORT_PRIVATE macros.
-#if defined(BUILDING_WTF)
+#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore)
#define WTF_EXPORTDATA WTF_EXPORT
#else
#define WTF_EXPORTDATA WTF_IMPORT
@@ -60,7 +65,7 @@
#else // !USE(EXPORT_MACROS)
#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !COMPILER(GCC)
-#if defined(BUILDING_WTF)
+#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore)
#define WTF_EXPORTDATA __declspec(dllexport)
#else
#define WTF_EXPORTDATA __declspec(dllimport)
@@ -77,7 +82,7 @@
#endif // USE(EXPORT_MACROS)
-#if defined(BUILDING_WTF)
+#if defined(BUILDING_WTF) || defined(BUILDING_JavaScriptCore)
#define WTF_EXPORT_PRIVATE WTF_EXPORT
#else
#define WTF_EXPORT_PRIVATE WTF_IMPORT
@@ -87,8 +92,10 @@
// extra exports it needs.
#if PLATFORM(WX)
#define WTF_EXPORT_PRIVATE_RTTI WTF_EXPORT_PRIVATE
+#define WTF_EXPORT_PRIVATE_NO_RTTI
#else
#define WTF_EXPORT_PRIVATE_RTTI
+#define WTF_EXPORT_PRIVATE_NO_RTTI WTF_EXPORT_PRIVATE
#endif
#define WTF_EXPORT_HIDDEN WTF_HIDDEN
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
