Show
Ignore:
Timestamp:
08/01/08 14:47:24 (5 months ago)
Author:
sroret
Message:

merge with webkit revision 35510

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/API/WebKitAvailability.h

    r388 r427  
    2727#define __WebKitAvailability__ 
    2828 
    29 #import <AvailabilityMacros.h> 
    30  
    3129/* The structure of this header is based on AvailabilityMacros.h.  The major difference is that the availability 
    3230   macros are defined in terms of WebKit version numbers rather than Mac OS X system version numbers, as WebKit 
     
    4341#define WEBKIT_VERSION_LATEST 0x9999 
    4442 
     43#ifdef __APPLE__ 
     44#import <AvailabilityMacros.h> 
     45#else 
     46// For non-Mac platforms, require the newest version. 
     47#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_LATEST 
     48#endif 
    4549 
    4650/* The versions of GCC that shipped with Xcode prior to 3.0 (GCC build number < 5400) did not support attributes on methods