Changeset 648 for trunk/src


Ignore:
Timestamp:
Mar 7, 2010, 9:50:22 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

global: Use declspec(dllexport) on OS/2 (first step to reduce the number of exports in DLLs).

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/3rdparty/javascriptcore/JavaScriptCore/API/JSBase.h

    r561 r648  
    6868#if defined(BUILDING_WX__)
    6969    #define JS_EXPORT
    70 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
     70#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) && !defined(__OS2__)
    7171    #define JS_EXPORT __attribute__((visibility("default")))
    7272#elif defined(_WIN32_WCE)
    … …  
    7878        #define JS_EXPORT
    7979    #endif
    80 #elif defined(WIN32) || defined(_WIN32)
     80#elif defined(WIN32) || defined(_WIN32) || defined(__OS2__)
    8181    /*
    8282     * TODO: Export symbols with JS_EXPORT when using MSVC.

  • trunk/src/3rdparty/javascriptcore/JavaScriptCore/config.h

    r561 r648  
    2727
    2828#if !defined(JS_EXPORTDATA)
    29 #if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
     29#if (PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)) || PLATFORM(OS2)
    3030#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
    3131#define JS_EXPORTDATA __declspec(dllexport)

  • trunk/src/3rdparty/webkit/JavaScriptCore/API/JSBase.h

    r561 r648  
    6868#if defined(BUILDING_WX__)
    6969    #define JS_EXPORT
    70 #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
     70#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__) && !defined(__OS2__)
    7171    #define JS_EXPORT __attribute__((visibility("default")))
    7272#elif defined(_WIN32_WCE)
    … …  
    7878        #define JS_EXPORT
    7979    #endif
    80 #elif defined(WIN32) || defined(_WIN32)
     80#elif defined(WIN32) || defined(_WIN32) || defined(__OS2__)
    8181    /*
    8282     * TODO: Export symbols with JS_EXPORT when using MSVC.

  • trunk/src/3rdparty/webkit/JavaScriptCore/config.h

    r561 r648  
    2626#include <wtf/Platform.h>
    2727
    28 #if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
     28#if (PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)) || PLATFORM(OS2)
    2929#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
    3030#define JS_EXPORTDATA __declspec(dllexport)

  • trunk/src/3rdparty/webkit/WebCore/config.h

    r561 r648  
    2626#include <wtf/Platform.h>
    2727
    28 #if PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)
     28#if (PLATFORM(WIN_OS) && !defined(BUILDING_WX__) && !COMPILER(GCC)) || PLATFORM(OS2)
    2929#if defined(BUILDING_JavaScriptCore) || defined(BUILDING_WTF)
    3030#define JS_EXPORTDATA __declspec(dllexport)

  • trunk/src/corelib/global/qglobal.h

    r561 r648  
    11601160
    11611161#ifndef Q_DECL_EXPORT
    1162 #  if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
     1162#  if defined(Q_OS_WIN) || defined(Q_OS_OS2) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
    11631163#    define Q_DECL_EXPORT __declspec(dllexport)
    11641164#  elif defined(QT_VISIBILITY_AVAILABLE)
    … …  
    11701170#endif
    11711171#ifndef Q_DECL_IMPORT
    1172 #  if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
     1172#  if defined(Q_OS_WIN) || defined(Q_OS_OS2) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
    11731173#    define Q_DECL_IMPORT __declspec(dllimport)
    11741174#  else
    … …  
    11781178
    11791179/*
    1180    Create Qt DLL if QT_DLL is defined (Windows and Symbian only)
    1181 */
    1182 
    1183 #if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
     1180   Create Qt DLL if QT_DLL is defined (Windows, Symbian and OS/2 only)
     1181*/
     1182
     1183#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) || defined(Q_OS_OS2)
    11841184#  if defined(QT_NODLL)
    11851185#    undef QT_MAKEDLL
Note: See TracChangeset for help on using the changeset viewer.