Changeset 184465 in webkit


Ignore:
Timestamp:
May 18, 2015, 5:23:14 AM (10 years ago)
Author:
Carlos Garcia Campos
Message:

webkit-gtk 2.3.3 fails to build on OS X - Conflicting type "Fixed"
​https://bugs.webkit.org/show_bug.cgi?id=126433

Don't include CoreFoundation.h when building the GTK port.

Patch by Philip Chimento <​philip.chimento@gmail.com> on 2015-01-06

  • Source/JavaScriptCore/API/WebKitAvailability.h: Add

!defined(BUILDING_GTK) to defined(APPLE).

Location:
releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/API/WebKitAvailability.h

    r161414 r184465  
    2727#define __WebKitAvailability__
    2828
    29 #ifdef __APPLE__
     29#if defined(__APPLE__) && !defined(BUILDING_GTK__)
    3030#include <AvailabilityMacros.h>
    3131#include <CoreFoundation/CoreFoundation.h>

  • releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog

    r184462 r184465  
     12015-01-06  Philip Chimento  <philip.chimento@gmail.com>
     2
     3        webkit-gtk 2.3.3 fails to build on OS X - Conflicting type "Fixed"
     4        https://bugs.webkit.org/show_bug.cgi?id=126433
     5
     6        Don't include CoreFoundation.h when building the GTK port.
     7
     8        * Source/JavaScriptCore/API/WebKitAvailability.h: Add
     9        !defined(BUILDING_GTK__) to defined(__APPLE__).
     10
    1112015-03-09  Mark Lam  <mark.lam@apple.com>
    212
Note: See TracChangeset for help on using the changeset viewer.