Commit 2f661a04 authored by kevino@webkit.org's avatar kevino@webkit.org

[wx] Unreviewed build fix. MSW build fixes.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 90824f81
2011-09-10 Kevin Ollivier <kevino@theolliviers.com>
[wx] Unreviewed build fix. MSW build fixes.
* config.h:
2011-09-09 David Hyatt <hyatt@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=67861
......@@ -29,7 +29,7 @@
#include <wtf/Platform.h>
#if OS(WINDOWS) && !OS(WINCE) && !PLATFORM(QT) && !PLATFORM(CHROMIUM) && !PLATFORM(GTK)
#if OS(WINDOWS) && !OS(WINCE) && !PLATFORM(QT) && !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(WX)
#include <WebCore/WebCoreHeaderDetection.h>
#endif
......
2011-09-10 Kevin Ollivier <kevino@theolliviers.com>
[wx] Unreviewed build fix. MSW build fixes.
* DumpRenderTree/config.h:
* waf/build/wxpresets.py:
2011-09-10 Andreas Kling <kling@webkit.org>
Crash beneath WKURLIsEqual() when reloading in MiniBrowser.
......@@ -53,6 +53,13 @@
#endif /* USE(EXPORT_MACROS) */
// On MSW, wx headers need to be included before windows.h is.
// The only way we can always ensure this is if we include wx here.
#if PLATFORM(WX)
#include <wx/defs.h>
#endif
#ifdef __cplusplus
#undef new
#undef delete
......@@ -69,6 +76,15 @@
#endif
#endif // PLATFORM(MAC)
#if OS(WINDOWS)
// If we don't define these, they get defined in windef.h.
// We want to use std::min and std::max
#undef max
#define max max
#undef min
#define min min
#endif
#if PLATFORM(WIN)
#define WTF_USE_CF 1
#if PLATFORM(WIN_CAIRO)
......@@ -85,13 +101,6 @@
#undef WINVER
#define WINVER 0x0500
// If we don't define these, they get defined in windef.h.
// We want to use std::min and std::max
#undef max
#define max max
#undef min
#define min min
#undef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
#endif // PLATFORM(WIN)
......@@ -25,6 +25,7 @@
import os
import re
import sys
import Options
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment