JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / config.h

diff --git a/config.h b/config.h
index 4e1d2b91cb028ec1fb97544e3fcf0f2305ae22ef..2761624b1c5882206bd3fcde64a29cf6fc50c5db 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -19,12 +19,8 @@
  *
  */
 
-#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
-#ifdef BUILDING_WITH_CMAKE
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
 #include "cmakeconfig.h"
-#else
-#include "autotoolsconfig.h"
-#endif
 #endif
 
 #include <wtf/Platform.h>
@@ -43,11 +39,6 @@
 #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
-#define min min
-
 #if !COMPILER(MSVC7_OR_LOWER) && !OS(WINCE)
 // We need to define this before the first #include of stdlib.h or it won't contain rand_s.
 #ifndef _CRT_RAND_S
@@ -72,3 +63,8 @@
 #else
 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
 #endif
+
+// Enable the following if you want to use the MacroAssembler::probe() facility
+// to do JIT debugging.
+#define WTF_USE_MASM_PROBE 0
+