Changeset 101199 in webkit

Timestamp:

Nov 26, 2011, 7:05:49 PM (15 years ago)

Author:

kevino@webkit.org

Message:

[wx] Unreviewed build fixes for Windows.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/wx/FileSystemWx.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/waf/build/settings.py (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-26  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Change the order of wx header includes
+        to avoid a windows.h inclusion order issue, and make sure a stub
+        method returns a value.
+
+        * platform/wx/FileSystemWx.cpp:
+        (WebCore::openFile):
+
 2011-11-26  Alejandro G. Castro  <alex@igalia.com>
 

trunk/Source/WebCore/platform/wx/FileSystemWx.cpp

@@ -31 +31 @@
 #include "FileSystem.h"
 
-#include "NotImplemented.h"
-#include "PlatformString.h"
-#include <wtf/text/CString.h>
-
 #include <wx/wx.h>
 #include <wx/datetime.h>
@@ -43 +39 @@
 #include <wx/filename.h>
 
+#include "NotImplemented.h"
+#include "PlatformString.h"
+#include <wtf/text/CString.h>
+
 #if OS(DARWIN)
 #include <CoreFoundation/CoreFoundation.h>
@@ -123 +123 @@
 {
     notImplemented();
+    return 0;
 }
     

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-26  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Enable the inspector.
+        
+        * waf/build/settings.py:
+
 2011-11-26  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/waf/build/settings.py

@@ -239 +239 @@
 
     feature_defines = ['ENABLE_DATABASE', 'ENABLE_SQL_DATABASE', 'ENABLE_XSLT', 'ENABLE_JAVASCRIPT_DEBUGGER',
-                    'ENABLE_SVG', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS',
+                    'ENABLE_SVG', 'ENABLE_FILTERS', 'ENABLE_SVG_FONTS', 'ENABLE_INSPECTOR',
                     'BUILDING_%s' % build_port.upper()]