diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-09 16:53:52 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-09 16:53:52 (GMT) |
| commit | aa46e5928b8fd97bada814e56134adb23a068b24 (patch) | |
| tree | df917faf833909ad09fc1b83ffde3ba9404dfd51 /src/3rdparty/webkit/JavaScriptCore/API/JSBase.h | |
| parent | b7c63e3d89006c9795835a79741b8d7a46891f93 (diff) | |
| parent | 5c53ea55e54f6371082a8ce7c3965f2fe54fcef5 (diff) | |
| download | Qt-aa46e5928b8fd97bada814e56134adb23a068b24.zip Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.gz Qt-aa46e5928b8fd97bada814e56134adb23a068b24.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/API/JSBase.h')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/API/JSBase.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h index f44d4ad..9f3d88e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h +++ b/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h @@ -65,14 +65,28 @@ typedef struct OpaqueJSValue* JSObjectRef; /* JavaScript symbol exports */ #undef JS_EXPORT -#if defined(__GNUC__) +#if defined(BUILDING_WX__) + #define JS_EXPORT +#elif defined(__GNUC__) #define JS_EXPORT __attribute__((visibility("default"))) +#elif defined(_WIN32_WCE) + #if defined(JS_BUILDING_JS) + #define JS_EXPORT __declspec(dllexport) + #elif defined(JS_IMPORT_JS) + #define JS_EXPORT __declspec(dllimport) + #else + #define JS_EXPORT + #endif #elif defined(WIN32) || defined(_WIN32) /* * TODO: Export symbols with JS_EXPORT when using MSVC. * See http://bugs.webkit.org/show_bug.cgi?id=16227 */ - #define JS_EXPORT + #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) + #define JS_EXPORT __declspec(dllexport) + #else + #define JS_EXPORT __declspec(dllimport) + #endif #else #define JS_EXPORT #endif |