JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / config.h

diff --git a/config.h b/config.h
index 9810885d73490b8f503221e29af9c776c059e5d7..1e49c96bf832fcd64d12d6d6ccf72dba739df301 100644 (file)
--- a/config.h
+++ b/config.h
@@ -20,25 +20,33 @@
  */
 
 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
  */
 
 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H

+#ifdef BUILDING_WITH_CMAKE
+#include "cmakeconfig.h"
+#else

 #include "autotoolsconfig.h"
 #endif
 #include "autotoolsconfig.h"
 #endif

+#endif

 
 #include <wtf/Platform.h>
 
 #include <wtf/Platform.h>

-
-#if !PLATFORM(CHROMIUM) && OS(WINDOWS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
-#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
-#define JS_EXPORTDATA __declspec(dllexport)
-#else
-#define JS_EXPORTDATA __declspec(dllimport)
-#endif
-#define JS_EXPORTCLASS JS_EXPORTDATA
-#else
-#define JS_EXPORTDATA
-#define JS_EXPORTCLASS
+#include <wtf/ExportMacros.h>
+// WTF cannot depend on JSC even if USE(JSC).
+#if USE(JSC) && !defined(BUILDING_WTF)
+#include "JSExportMacros.h"
+#elif PLATFORM(CHROMIUM)
+// Chromium doesn't have runtime/ in its include paths.
+#include "runtime/JSExportMacros.h"

 #endif
 
 #if OS(WINDOWS)
 
 #endif
 
 #if OS(WINDOWS)
 

+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+
+#ifndef WINVER
+#define WINVER 0x0500
+#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
 // If we don't define these, they get defined in windef.h. 
 // We want to use std::min and std::max
 #define max max


@@ -53,13 +61,6 @@
 
 #endif
 
 
 #endif
 

-#if OS(FREEBSD) || OS(OPENBSD)
-#define HAVE_PTHREAD_NP_H 1
-#endif
-
-/* FIXME: if all platforms have these, do they really need #defines? */
-#define HAVE_STDINT_H 1
-

 #define WTF_CHANGES 1
 
 #ifdef __cplusplus
 #define WTF_CHANGES 1
 
 #ifdef __cplusplus


@@ -69,9 +70,9 @@
 #endif
 
 // this breaks compilation of <QFontDatabase>, at least, so turn it off for now
 #endif
 
 // this breaks compilation of <QFontDatabase>, at least, so turn it off for now

-// Also generates errors on wx on Windows, because these functions
-// are used from wx headers. 
-#if !PLATFORM(QT) && !PLATFORM(WX)
+// Also generates errors on wx on Windows and QNX, because these functions
+// are used from wx and QNX headers. 
+#if !PLATFORM(QT) && !PLATFORM(WX) && !OS(QNX)

 #include <wtf/DisallowCType.h>
 #endif
 
 #include <wtf/DisallowCType.h>
 #endif
 


@@ -80,16 +81,3 @@
 #else
 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
 #endif
 #else
 #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
 #endif

-
-#if PLATFORM(CHROMIUM)
-#if !defined(WTF_USE_V8)
-#define WTF_USE_V8 1
-#endif
-#endif /* PLATFORM(CHROMIUM) */
-
-#if !defined(WTF_USE_V8)
-#define WTF_USE_V8 0
-#endif /* !defined(WTF_USE_V8) */
-
-/* Using V8 implies not using JSC and vice versa */
-#define WTF_USE_JSC !WTF_USE_V8