Reviewed by Mark Rowe.

        <rdar://problem/5403302> HIWebView.h should be #ifdefed out for 64-bit

        * Carbon/HIWebView.h: #ifdef out the header in 64-bit. Adds a comment about 32-bit only.
        * Carbon/CarbonUtils.h: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25004 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon/CarbonUtils.h b/WebKit/Carbon/CarbonUtils.h
index 872df2308cbd900d47e5d77d187a0150de808034..ee4f42ec89eccb63f65880d6874f1c14bdbaeee6 100644 (file)
--- a/WebKit/Carbon/CarbonUtils.h
+++ b/WebKit/Carbon/CarbonUtils.h
@@ -29,6 +29,10 @@
 #ifndef __HIWEBCARBONUTILS__
 #define __HIWEBCARBONUTILS__
 
+#ifndef __LP64__
+
+// These functions are only available for 32-bit.
+
 #ifdef __OBJC__
 #import <ApplicationServices/ApplicationServices.h>
 @class NSImage;
@@ -52,4 +56,5 @@ WebConvertNSImageToCGImageRef(NSImage * inImage);
 }
 #endif
 
+#endif
 #endif // __HIWEBCARBONUTILS__

diff --git a/WebKit/Carbon/HIWebView.h b/WebKit/Carbon/HIWebView.h
index 5cce1d95ba4f76b7f50b5fe75e6e1ff7bc237d17..44d6d86cc988bf6126b0f6c5d0b54d0099a634d6 100644 (file)
--- a/WebKit/Carbon/HIWebView.h
+++ b/WebKit/Carbon/HIWebView.h
@@ -29,6 +29,8 @@
 #ifndef __HIWebView__
 #define __HIWebView__
 
+#ifndef __LP64__
+
 #include <Carbon/Carbon.h>
 
 #include <AvailabilityMacros.h>
@@ -60,7 +62,7 @@ extern "C" {
  *    An operating system status code.
  *  
  *  Availability:
- *    Mac OS X:         in version 10.2.7 and later
+ *    Mac OS X:         in version 10.2.7 and later [32-bit only]
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  */
@@ -86,7 +88,7 @@ HIWebViewCreate(HIViewRef * outControl);
  *    An operating system status code.
  *  
  *  Availability:
- *    Mac OS X:         in version 10.4 and later
+ *    Mac OS X:         in version 10.4 and later [32-bit only]
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  */
@@ -110,7 +112,7 @@ HIWebViewCreateWithClass(
  *    A pointer to a web view object, or NULL.
  *  
  *  Availability:
- *    Mac OS X:         in version 10.2.7 and later
+ *    Mac OS X:         in version 10.2.7 and later [32-bit only]
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  */
@@ -123,4 +125,5 @@ HIWebViewGetWebView(HIViewRef inView);
 }
 #endif
 
+#endif
 #endif /* __HIWebView__ */

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9b2dafbaff10e2a816cc33b2c80222becc5f1282..63fed5049a33d94602114988d11dc399b1d66ab5 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-10  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        <rdar://problem/5403302> HIWebView.h should be #ifdefed out for 64-bit
+
+        * Carbon/HIWebView.h: #ifdef out the header in 64-bit. Adds a comment about 32-bit only.
+        * Carbon/CarbonUtils.h: Ditto.
+
 2007-08-10  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam.