Title: [101199] trunk
- Revision
- 101199
- Author
- [email protected]
- Date
- 2011-11-26 19:05:49 -0800 (Sat, 26 Nov 2011)
Log Message
[wx] Unreviewed build fixes for Windows.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101198 => 101199)
--- trunk/Source/WebCore/ChangeLog 2011-11-27 01:26:19 UTC (rev 101198)
+++ trunk/Source/WebCore/ChangeLog 2011-11-27 03:05:49 UTC (rev 101199)
@@ -1,3 +1,12 @@
+2011-11-26 Kevin Ollivier <[email protected]>
+
+ [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 <[email protected]>
Fix compilation after r101157.
Modified: trunk/Source/WebCore/platform/wx/FileSystemWx.cpp (101198 => 101199)
--- trunk/Source/WebCore/platform/wx/FileSystemWx.cpp 2011-11-27 01:26:19 UTC (rev 101198)
+++ trunk/Source/WebCore/platform/wx/FileSystemWx.cpp 2011-11-27 03:05:49 UTC (rev 101199)
@@ -30,10 +30,6 @@
#include "config.h"
#include "FileSystem.h"
-#include "NotImplemented.h"
-#include "PlatformString.h"
-#include <wtf/text/CString.h>
-
#include <wx/wx.h>
#include <wx/datetime.h>
#include <wx/dir.h>
@@ -42,6 +38,10 @@
#include <wx/filefn.h>
#include <wx/filename.h>
+#include "NotImplemented.h"
+#include "PlatformString.h"
+#include <wtf/text/CString.h>
+
#if OS(DARWIN)
#include <CoreFoundation/CoreFoundation.h>
#endif
@@ -122,6 +122,7 @@
PlatformFileHandle openFile(const String& path, FileOpenMode mode)
{
notImplemented();
+ return 0;
}
void closeFile(PlatformFileHandle& handle)
Modified: trunk/Tools/ChangeLog (101198 => 101199)
--- trunk/Tools/ChangeLog 2011-11-27 01:26:19 UTC (rev 101198)
+++ trunk/Tools/ChangeLog 2011-11-27 03:05:49 UTC (rev 101199)
@@ -1,3 +1,9 @@
+2011-11-26 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Enable the inspector.
+
+ * waf/build/settings.py:
+
2011-11-26 Martin Robinson <[email protected]>
Try to fix the build after r101174.
Modified: trunk/Tools/waf/build/settings.py (101198 => 101199)
--- trunk/Tools/waf/build/settings.py 2011-11-27 01:26:19 UTC (rev 101198)
+++ trunk/Tools/waf/build/settings.py 2011-11-27 03:05:49 UTC (rev 101199)
@@ -238,7 +238,7 @@
build_port = Options.options.port
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()]
conf.env["FEATURE_DEFINES"] = ' '.join(feature_defines)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
