Replace all includes of windows.h with qt_windows.h
We don't want min and max to be macros. Change-Id: Ifa79eaecf00c9f8b9c61494aa9d883eebfdabc65 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
parent
9ec55bb0c7
commit
5aa0a4f722
|
@ -50,7 +50,7 @@
|
|||
#endif
|
||||
|
||||
#if OS(WINDOWS)
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
#else
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
@ -215,7 +215,7 @@ WTF_EXPORT_PRIVATE void WTFInstallReportBacktraceOnCrashHook();
|
|||
|
||||
#if OS(WINCE)
|
||||
/* FIXME: We include this here only to avoid a conflict with the ASSERT macro. */
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
#undef min
|
||||
#undef max
|
||||
#undef ERROR
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
#include <wtf/UnusedParam.h>
|
||||
|
||||
#if OS(WINDOWS)
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
#elif OS(QNX)
|
||||
#include <atomic.h>
|
||||
#endif
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#if OS(WINDOWS)
|
||||
#include <malloc.h>
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
#endif
|
||||
|
||||
#if HAVE(ERRNO_H)
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
#if OS(WINDOWS)
|
||||
#include <malloc.h>
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
#endif
|
||||
|
||||
namespace WTF {
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
// QDateTime already included above
|
||||
#else
|
||||
# ifdef Q_OS_WIN
|
||||
# include <windows.h>
|
||||
# include <qt_windows.h>
|
||||
# else
|
||||
# ifndef Q_OS_VXWORKS
|
||||
# include <sys/time.h>
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
# include "qplatformdefs.h"
|
||||
# endif
|
||||
#else
|
||||
# include <windows.h>
|
||||
# include <qt_windows.h>
|
||||
#endif
|
||||
|
||||
using namespace QV4;
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#include <QtCore/qdebug.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
# include "qplatformdefs.h"
|
||||
# endif
|
||||
#else
|
||||
# include <windows.h>
|
||||
# include <qt_windows.h>
|
||||
#endif
|
||||
|
||||
using namespace QV4;
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include <private/qv4global_p.h>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <windows.h>
|
||||
#include <qt_windows.h>
|
||||
#endif
|
||||
|
||||
class tst_QV4Assembler : public QQmlDataTest
|
||||
|
|
Loading…
Reference in New Issue