Diff
Modified: trunk/ChangeLog (112559 => 112560)
--- trunk/ChangeLog 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/ChangeLog 2012-03-29 19:25:48 UTC (rev 112560)
@@ -1,3 +1,10 @@
+2012-03-29 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Remove a couple sources wx
+ should not build.
+
+ * wscript:
+
2012-03-29 Zalan Bujtas <[email protected]>
Remove redundant updateViewportArguments() call when page is restored from page cache.
Modified: trunk/Source/_javascript_Core/ChangeLog (112559 => 112560)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-29 19:25:48 UTC (rev 112560)
@@ -1,3 +1,10 @@
+2012-03-29 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix, add Win-specific sources
+ the wx port needs after WTF move.
+
+ * wscript:
+
2012-03-29 Andy Estes <[email protected]>
Remove an unused variable that breaks the build with newer versions of clang.
Modified: trunk/Source/_javascript_Core/wscript (112559 => 112560)
--- trunk/Source/_javascript_Core/wscript 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/Source/_javascript_Core/wscript 2012-03-29 19:25:48 UTC (rev 112560)
@@ -42,6 +42,7 @@
if Options.options.port == "wx":
if building_on_win32:
jscore_excludes += ['OSAllocatorPosix.cpp', 'ThreadingPthreads.cpp']
+ sources.extend(['../WTF/wtf/ThreadingWin.cpp', '../WTF/wtf/ThreadSpecificWin.cpp', '../WTF/wtf/OSAllocatorWin.cpp'])
else:
jscore_excludes.append('JSStringRefBSTR.cpp')
Modified: trunk/Source/WTF/ChangeLog (112559 => 112560)
--- trunk/Source/WTF/ChangeLog 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/Source/WTF/ChangeLog 2012-03-29 19:25:48 UTC (rev 112560)
@@ -1,5 +1,16 @@
2012-03-29 Kevin Ollivier <[email protected]>
+ [wx] Unreviewed build fix. Add export symbols needed to
+ build wx under Windows.
+
+ * wtf/NullPtr.h:
+ * wtf/ParallelJobsGeneric.h:
+ (ParallelEnvironment):
+ * wtf/ThreadSpecific.h:
+ (WTF):
+
+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.
Modified: trunk/Source/WTF/wtf/NullPtr.h (112559 => 112560)
--- trunk/Source/WTF/wtf/NullPtr.h 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/Source/WTF/wtf/NullPtr.h 2012-03-29 19:25:48 UTC (rev 112560)
@@ -40,10 +40,10 @@
#else
namespace std {
- class nullptr_t { };
+ class WTF_EXPORT_PRIVATE nullptr_t { };
}
-extern std::nullptr_t nullptr;
+extern WTF_EXPORT_PRIVATE std::nullptr_t nullptr;
#endif
Modified: trunk/Source/WTF/wtf/ParallelJobsGeneric.h (112559 => 112560)
--- trunk/Source/WTF/wtf/ParallelJobsGeneric.h 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/Source/WTF/wtf/ParallelJobsGeneric.h 2012-03-29 19:25:48 UTC (rev 112560)
@@ -40,14 +40,14 @@
public:
typedef void (*ThreadFunction)(void*);
- ParallelEnvironment(ThreadFunction, size_t sizeOfParameter, int requestedJobNumber);
+ WTF_EXPORT_PRIVATE ParallelEnvironment(ThreadFunction, size_t sizeOfParameter, int requestedJobNumber);
int numberOfJobs()
{
return m_numberOfJobs;
}
- void execute(void* parameters);
+ WTF_EXPORT_PRIVATE void execute(void* parameters);
class ThreadPrivate : public RefCounted<ThreadPrivate> {
public:
Modified: trunk/Source/WTF/wtf/ThreadSpecific.h (112559 => 112560)
--- trunk/Source/WTF/wtf/ThreadSpecific.h 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/Source/WTF/wtf/ThreadSpecific.h 2012-03-29 19:25:48 UTC (rev 112560)
@@ -136,8 +136,8 @@
// 2) We do not need to hold many instances of ThreadSpecific<> data. This fixed number should be far enough.
const int kMaxTlsKeySize = 256;
-long& tlsKeyCount();
-DWORD* tlsKeys();
+WTF_EXPORT_PRIVATE long& tlsKeyCount();
+WTF_EXPORT_PRIVATE DWORD* tlsKeys();
template<typename T>
inline ThreadSpecific<T>::ThreadSpecific()
Modified: trunk/wscript (112559 => 112560)
--- trunk/wscript 2012-03-29 19:25:04 UTC (rev 112559)
+++ trunk/wscript 2012-03-29 19:25:48 UTC (rev 112560)
@@ -341,8 +341,9 @@
excludes.append('WebGLContextEvent.cpp')
excludes.append('FileSystemPOSIX.cpp')
excludes.append('SharedBufferPOSIX.cpp')
+ excludes.append('TouchAdjustment.cpp')
+ excludes.append('DNSResolveQueue.cpp')
-
# These files appear not to build with older versions of ICU
excludes.append('LocalizedNumberICU.cpp')
excludes.append('LocaleToScriptMappingICU.cpp')
