diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:28:57 (GMT) |
| commit | b768917f043bd78ac8af125c1993f05776a052b7 (patch) | |
| tree | 754a0eba403a781332f28da087c8493c82a57fd5 /src/3rdparty/javascriptcore/JavaScriptCore/config.h | |
| parent | be63c460b84c694dbae10494e491256bd53a5c0b (diff) | |
| parent | fafec8f2363fd7ab3ce5b81a66cc82001a58c8ed (diff) | |
| download | Qt-b768917f043bd78ac8af125c1993f05776a052b7.zip Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.gz Qt-b768917f043bd78ac8af125c1993f05776a052b7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
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) |