Changeset 75806 in webkit
- Timestamp:
- Jan 14, 2011 11:50:47 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/API/JSBase.h
r52598 r75806 64 64 65 65 /* JavaScript symbol exports */ 66 /* These rules should stay the same as in WebKit2/Shared/API/c/WKBase.h */ 66 67 67 68 #undef JS_EXPORT 68 69 #if defined(JS_NO_EXPORT) 69 70 #define JS_EXPORT 70 71 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) 71 #define JS_EXPORT __attribute__((visibility("default"))) 72 #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) 73 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 74 #define JS_EXPORT __declspec(dllexport) 75 #else 76 #define JS_EXPORT __declspec(dllimport) 77 #endif 72 #define JS_EXPORT __attribute__((visibility("default"))) 73 #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__) 74 #if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF) 75 #define JS_EXPORT __declspec(dllexport) 78 76 #else 79 #define JS_EXPORT 77 #define JS_EXPORT __declspec(dllimport) 80 78 #endif 79 #else /* !defined(JS_NO_EXPORT) */ 80 #define JS_EXPORT 81 #endif /* defined(JS_NO_EXPORT) */ 81 82 82 83 #ifdef __cplusplus -
trunk/Source/JavaScriptCore/ChangeLog
r75796 r75806 1 2011-01-14 Laszlo Gombos <laszlo.1.gombos@nokia.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 Align import/export directives 6 https://bugs.webkit.org/show_bug.cgi?id=52208 7 8 * API/JSBase.h: Align import/export directives with 9 WebKit2/Shared/API/c/WKBase.h 10 1 11 2011-01-14 Michael Saboff <msaboff@apple.com> 2 12 -
trunk/WebKit2/ChangeLog
r75777 r75806 1 2011-01-14 Laszlo Gombos <laszlo.1.gombos@nokia.com> 2 3 Reviewed by Kenneth Rohde Christiansen. 4 5 Align import/export directives 6 https://bugs.webkit.org/show_bug.cgi?id=52208 7 8 * Shared/API/c/WKBase.h: Align import/export directives with 9 JavaScriptCore/API/JSBase.h. 10 1 11 2011-01-14 Pavel Feldman <pfeldman@chromium.org> 2 12 -
trunk/WebKit2/Shared/API/c/WKBase.h
r75508 r75806 100 100 typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef; 101 101 102 /* These rules should stay the same as in JavaScriptCore/API/JSBase.h */ 103 102 104 #undef WK_EXPORT 103 105 #if defined(WK_NO_EXPORT) 104 106 #define WK_EXPORT 105 #elif defined(__GNUC__) && !defined(__ ARMCC__)107 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) 106 108 #define WK_EXPORT __attribute__((visibility("default"))) 107 #elif defined(WIN32) || defined(_WIN32) || defined(_ _ARMCC__)109 #elif defined(WIN32) || defined(_WIN32) || defined(_WIN32_WCE) || defined(__CC_ARM) || defined(__ARMCC__) 108 110 #if BUILDING_WEBKIT 109 111 #define WK_EXPORT __declspec(dllexport) … … 111 113 #define WK_EXPORT __declspec(dllimport) 112 114 #endif 113 #else 115 #else /* !defined(WK_NO_EXPORT) */ 114 116 #define WK_EXPORT 115 #endif 117 #endif /* defined(WK_NO_EXPORT) */ 116 118 117 119 #endif /* WKBase_h */
Note: See TracChangeset
for help on using the changeset viewer.