Changeset 179907 in webkit


Ignore:
Timestamp:
Feb 10, 2015 5:42:19 PM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r179896.
​https://bugs.webkit.org/show_bug.cgi?id=141452

broke linking debug builds (Requested by thorton on #webkit).

Reverted changeset:

"Stop using WebCore.exp.in on Mac and iOS."
​https://bugs.webkit.org/show_bug.cgi?id=141413
​http://trac.webkit.org/changeset/179896

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r179903 r179907  
     12015-02-10  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r179896.
     4        https://bugs.webkit.org/show_bug.cgi?id=141452
     5
     6        broke linking debug builds (Requested by thorton on #webkit).
     7
     8        Reverted changeset:
     9
     10        "Stop using WebCore.exp.in on Mac and iOS."
     11        https://bugs.webkit.org/show_bug.cgi?id=141413
     12        http://trac.webkit.org/changeset/179896
     13
    1142015-02-10  Alex Christensen  <achristensen@webkit.org>
    215

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r179896 r179907  
    5757GCC_OBJC_CALL_CXX_CDTORS = YES;
    5858GCC_PRECOMPILE_PREFIX_HEADER = YES;
    59 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
    6059GCC_THREADSAFE_STATICS = NO;
    6160GCC_TREAT_WARNINGS_AS_ERRORS = YES;

  • trunk/Source/WebCore/platform/PlatformExportMacros.h

    r179896 r179907  
    3333#include <wtf/ExportMacros.h>
    3434
     35#if defined(BUILDING_WebCore) || defined(BUILDING_WebKit) || \
     36    defined(STATICALLY_LINKED_WITH_WebCore) || defined(STATICALLY_LINKED_WITH_WebKit)
     37#define WEBCORE_IS_LINKED_IN_SAME_BINARY 1
     38#endif
     39
    3540// See note in wtf/Platform.h for more info on EXPORT_MACROS.
    3641#if USE(EXPORT_MACROS)
    3742
    38 // FIXME: Get rid of WebKitExports.def.in and make this work on Windows.
    39 #if !PLATFORM(WIN)
    40 #define WEBCORE_EXPORT WTF_EXPORT
     43#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
     44#define WEBKIT_EXPORTDATA WTF_EXPORT
    4145#else
     46#define WEBKIT_EXPORTDATA WTF_IMPORT
     47#endif
     48
     49// FIXME: This should be WTF_EXPORT once WEBCORE_EXPORT is used instead of WebCore.exp.in.
    4250#define WEBCORE_EXPORT
    43 #endif
    4451
    4552#else // !USE(EXPORT_MACROS)
    … …  
    4754#define WEBCORE_EXPORT
    4855
     56#if OS(WINDOWS) && !COMPILER(GCC)
     57
     58#if defined(WEBCORE_IS_LINKED_IN_SAME_BINARY)
     59#define WEBKIT_EXPORTDATA __declspec(dllexport)
     60#else
     61#define WEBKIT_EXPORTDATA __declspec(dllimport)
     62#endif
     63
     64#else // !PLATFORM...
     65
     66#define WEBKIT_EXPORTDATA
     67
     68#endif // !PLATFORM...
     69
    4970#endif // USE(EXPORT_MACROS)
    5071
Note: See TracChangeset for help on using the changeset viewer.