Changeset 75806 in webkit


Ignore:
Timestamp:
Jan 14, 2011 11:50:47 AM (13 years ago)
Author:
Laszlo Gombos
Message:

2011-01-14 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

Align import/export directives
https://bugs.webkit.org/show_bug.cgi?id=52208

  • API/JSBase.h: Align import/export directives with WebKit2/Shared/API/c/WKBase.h

2011-01-14 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

Align import/export directives
https://bugs.webkit.org/show_bug.cgi?id=52208

  • Shared/API/c/WKBase.h: Align import/export directives with JavaScriptCore/API/JSBase.h.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/API/JSBase.h

    r52598 r75806  
    6464
    6565/* JavaScript symbol exports */
     66/* These rules should stay the same as in WebKit2/Shared/API/c/WKBase.h */
    6667
    6768#undef JS_EXPORT
    6869#if defined(JS_NO_EXPORT)
    69     #define JS_EXPORT
     70#define JS_EXPORT
    7071#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)
    7876#else
    79     #define JS_EXPORT
     77#define JS_EXPORT __declspec(dllimport)
    8078#endif
     79#else /* !defined(JS_NO_EXPORT) */
     80#define JS_EXPORT
     81#endif /* defined(JS_NO_EXPORT) */
    8182
    8283#ifdef __cplusplus
  • trunk/Source/JavaScriptCore/ChangeLog

    r75796 r75806  
     12011-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
    1112011-01-14  Michael Saboff  <msaboff@apple.com>
    212
  • trunk/WebKit2/ChangeLog

    r75777 r75806  
     12011-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
    1112011-01-14  Pavel Feldman  <pfeldman@chromium.org>
    212
  • trunk/WebKit2/Shared/API/c/WKBase.h

    r75508 r75806  
    100100typedef const struct OpaqueWKBundleScriptWorld* WKBundleScriptWorldRef;
    101101
     102/* These rules should stay the same as in JavaScriptCore/API/JSBase.h */
     103
    102104#undef WK_EXPORT
    103105#if defined(WK_NO_EXPORT)
    104106#define WK_EXPORT
    105 #elif defined(__GNUC__) && !defined(__ARMCC__)
     107#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
    106108#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__)
    108110#if BUILDING_WEBKIT
    109111#define WK_EXPORT __declspec(dllexport)
     
    111113#define WK_EXPORT __declspec(dllimport)
    112114#endif
    113 #else
     115#else /* !defined(WK_NO_EXPORT) */
    114116#define WK_EXPORT
    115 #endif
     117#endif /* defined(WK_NO_EXPORT) */
    116118
    117119#endif /* WKBase_h */
Note: See TracChangeset for help on using the changeset viewer.