diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-09-24 14:35:49 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-09-24 15:36:17 (GMT) |
| commit | aabd12223bda6260756ab19430082477d5669c0a (patch) | |
| tree | 6ca7a12e627915992cfd0038f6ddd8ee244711f4 /src/3rdparty/javascriptcore/JavaScriptCore/config.h | |
| parent | 270c374c178ec5a532d37168b018cd7ebc844558 (diff) | |
| download | Qt-aabd12223bda6260756ab19430082477d5669c0a.zip Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.gz Qt-aabd12223bda6260756ab19430082477d5669c0a.tar.bz2 | |
Update src/3rdparty/javascriptcore and adapt src/script to the changes.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/config.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index 6681761..5e70265 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -25,6 +25,7 @@ #include <wtf/Platform.h> +#if !defined(JS_EXPORTDATA) #if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC) #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) #define JS_EXPORTDATA __declspec(dllexport) @@ -34,6 +35,7 @@ #else #define JS_EXPORTDATA #endif +#endif #if PLATFORM(WIN_OS) |