summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/config.h
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-11-08 18:19:26 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-11-08 18:19:27 +0100
commitc617e2a25aca6cb95ab9d1a7cc55b363a12e861e (patch)
tree6d6f74338e81973c5f5d11984d822ee450205074 /Source/JavaScriptCore/config.h
parent056b920c01121c095b20fa7ee3886c0bfebd3536 (diff)
parent8c7a7606acbb2083c8077cce57054f43744cb1c0 (diff)
downloadqtwebkit-c617e2a25aca6cb95ab9d1a7cc55b363a12e861e.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4e82a7abec9b95d3148e1eddc786ee5a16d1f768
Diffstat (limited to 'Source/JavaScriptCore/config.h')
-rw-r--r--Source/JavaScriptCore/config.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h
index 4e1d2b91c..a5df3aa7a 100644
--- a/Source/JavaScriptCore/config.h
+++ b/Source/JavaScriptCore/config.h
@@ -34,15 +34,6 @@
#endif
#if OS(WINDOWS)
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0502
-#endif
-
-#ifndef WINVER
-#define WINVER 0x0502
-#endif
-
// If we don't define these, they get defined in windef.h.
// We want to use std::min and std::max
#define max max