Changeset 190862 in webkit


Ignore:
Timestamp:
Oct 12, 2015 10:59:45 AM (8 years ago)
Author:
Michael Catanzaro
Message:

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

Patch by Philip Chimento <philip.chimento@gmail.com> on 2015-10-12
Reviewed by Philippe Normand

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

  • Source/JavaScriptCore/API/WebKitAvailability.h: Add !defined(BUILDING_GTK) to defined(APPLE).
Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

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

    r182328 r190862  
    2727#define __WebKitAvailability__
    2828
    29 #ifdef __APPLE__
     29#if defined(__APPLE__) && !defined(BUILDING_GTK__)
    3030
    3131#include <AvailabilityMacros.h>
  • trunk/Source/JavaScriptCore/ChangeLog

    r190860 r190862  
     12015-10-12  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        Reviewed by Philippe Normand
     7
     8        Don't include CoreFoundation.h when building the GTK port.
     9
     10        * Source/JavaScriptCore/API/WebKitAvailability.h: Add !defined(BUILDING_GTK__) to defined(__APPLE__).
     11
    1122015-10-10  Filip Pizlo  <fpizlo@apple.com>
    213
Note: See TracChangeset for help on using the changeset viewer.