Reviewed by Darin.

        workaround for <rdar://problem/4294625> to fix our build

        * kwq/KWQPointArray.h:
        * kwq/KWQSize.h:

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

diff --git a/WebCore/ChangeLog-2005-12-19 b/WebCore/ChangeLog-2005-12-19
index ab78c0ec03798e359f1b07e99010b4aba87a607a..544f4278eba2bbca0d0ffb05e3aa8bf6628b057b 100644 (file)
--- a/WebCore/ChangeLog-2005-12-19
+++ b/WebCore/ChangeLog-2005-12-19
@@ -1,3 +1,12 @@
+2005-10-11  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        workaround for <rdar://problem/4294625> to fix our build
+        
+        * kwq/KWQPointArray.h:
+        * kwq/KWQSize.h:
+
 2005-10-10  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by eric

diff --git a/WebCore/kwq/KWQPointArray.h b/WebCore/kwq/KWQPointArray.h
index d0c511e4ea26647f589f42ad85b9d603e612a8b6..8969d8a589895a1515b94b5c12337698956c9050 100644 (file)
--- a/WebCore/kwq/KWQPointArray.h
+++ b/WebCore/kwq/KWQPointArray.h
@@ -34,6 +34,11 @@
 
 #include "KWQMemArray.h"
 
+// workaround for <rdar://problem/4294625>
+#if ! __LP64__ && ! NS_BUILD_32_LIKE_64
+#undef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+#endif
+
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGPoint NSPoint;
 #else

diff --git a/WebCore/kwq/KWQSize.h b/WebCore/kwq/KWQSize.h
index 0bc8b1823142d2cc4a9289857862190617855c33..082c76bf9f9db6a5b168304a264f8a9e3f1340e1 100644 (file)
--- a/WebCore/kwq/KWQSize.h
+++ b/WebCore/kwq/KWQSize.h
@@ -32,6 +32,11 @@
 #include <iosfwd>
 #endif
 
+// workaround for <rdar://problem/4294625>
+#if ! __LP64__ && ! NS_BUILD_32_LIKE_64
+#undef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+#endif
+
 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 typedef struct CGSize NSSize;
 #else