[webkit-changes] cvs commit: WebKit/WebView.subproj WebPreferencesPrivate.h

[Darin]

darin       05/12/10 07:27:57

  Modified:    .        ChangeLog
               WebView.subproj WebPreferencesPrivate.h
  Log:
          Was getting build failures related to "count" methods.
          Made Tim's build fix Leopard-only.
  
          * WebView.subproj/WebPreferencesPrivate.h: Go back to <PDFKit/PDFKit.h> on Tiger.
  
  Revision  Changes    Path
  1.3396    +7 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3395
  retrieving revision 1.3396
  diff -u -r1.3395 -r1.3396
  --- ChangeLog	10 Dec 2005 04:51:55 -0000	1.3395
  +++ ChangeLog	10 Dec 2005 15:27:50 -0000	1.3396
  @@ -1,3 +1,10 @@
  +2005-12-10  Darin Adler  <darin at apple.com>
  +
  +        Was getting build failures related to "count" methods.
  +        Made Tim's build fix Leopard-only.
  +
  +        * WebView.subproj/WebPreferencesPrivate.h: Go back to <PDFKit/PDFKit.h> on Tiger.
  +
   2005-12-09  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Adele Peterson.
  
  
  
  1.30      +13 -0     WebKit/WebView.subproj/WebPreferencesPrivate.h
  
  Index: WebPreferencesPrivate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebPreferencesPrivate.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- WebPreferencesPrivate.h	9 Dec 2005 18:59:39 -0000	1.29
  +++ WebPreferencesPrivate.h	10 Dec 2005 15:27:57 -0000	1.30
  @@ -27,8 +27,21 @@
    */
   
   #import <WebKit/WebPreferences.h>
  +
  +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
  +
  +// NOTE: #importing Quartz/Quartz.h causes an ambiguous signature conflict anywhere the method "count" is used.
  +// To avoid this, we #import just this specific header. For this to work, the project's Framework Search Paths
  +// has been modified to include /System/Library/Frameworks/Quartz.framework/Frameworks. Clients that include 
  +// this file may have to do this same trick.
  +#import <PDFKit/PDFView.h>
  +
  +#else
  +
   #import <Quartz/Quartz.h>
   
  +#endif
  +
   @interface WebPreferences (WebPrivate)
   
   // Preferences that might be public in a future release