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

[Timothy]

thatcher    05/12/09 10:59:39

  Modified:    .        ChangeLog
               WebView.subproj WebPreferencesPrivate.h
  Log:
          Reviewed by nobody, build fix.
  
          Using <PDFKit/PDFKit.h> was causing build failures for the Mail team.
          The comment about getting an ambiguous signature conflict anywhere the
          method "count" is used seems to no longer be an issue.
  
          * WebView.subproj/WebPreferencesPrivate.h: Use <Quartz/Quartz.h>
  
  Revision  Changes    Path
  1.3393    +10 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3392
  retrieving revision 1.3393
  diff -u -r1.3392 -r1.3393
  --- ChangeLog	9 Dec 2005 02:12:27 -0000	1.3392
  +++ ChangeLog	9 Dec 2005 18:59:36 -0000	1.3393
  @@ -1,3 +1,13 @@
  +2005-12-09  Timothy Hatcher  <timothy at apple.com>
  +
  +        Reviewed by nobody, build fix.
  +
  +        Using <PDFKit/PDFKit.h> was causing build failures for the Mail team.
  +        The comment about getting an ambiguous signature conflict anywhere the
  +        method "count" is used seems to no longer be an issue.
  +
  +        * WebView.subproj/WebPreferencesPrivate.h: Use <Quartz/Quartz.h>
  +
   2005-12-08  John Sullivan  <sullivan at apple.com>
   
           Reviewed by Tim Hatcher.
  
  
  
  1.29      +1 -6      WebKit/WebView.subproj/WebPreferencesPrivate.h
  
  Index: WebPreferencesPrivate.h
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebPreferencesPrivate.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- WebPreferencesPrivate.h	28 Sep 2005 02:25:58 -0000	1.28
  +++ WebPreferencesPrivate.h	9 Dec 2005 18:59:39 -0000	1.29
  @@ -27,12 +27,7 @@
    */
   
   #import <WebKit/WebPreferences.h>
  -
  -#import <PDFKit/PDFView.h>
  -// 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 <Quartz/Quartz.h>
   
   @interface WebPreferences (WebPrivate)