Reviewed by Tim Hatcher's rubber stamp

        Fixed Intel build break caused by weinig's -W change in r15781

        * WebView/WebView.m: wrapped cpu-dependent defs with defined() macro

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 927327501f7ca58da734cfd153fcabf97e5b82f2..be8212d91ae07e279128d52cfc89eab1cc162f9b 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-03  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Tim Hatcher's rubber stamp
+        Fixed Intel build break caused by weinig's -W change in r15781
+
+        * WebView/WebView.m: wrapped cpu-dependent defs with defined() macro
+
 2006-08-03  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by John.
@@ -116,6 +123,7 @@
         (-[WebMainResourceLoader didFailWithError:]):
         (-[WebMainResourceLoader loadWithRequestNow:]):
 
+>>>>>>> .r15785
 2006-08-03  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Darin.

diff --git a/WebKit/WebView/WebView.m b/WebKit/WebView/WebView.m
index fd2c29eae7d90a14bf4f29b1830b6654aa706cf4..e17c64a998f33ec51da49411e8f0f89f0e2cabff 100644 (file)
--- a/WebKit/WebView/WebView.m
+++ b/WebKit/WebView/WebView.m
@@ -97,9 +97,9 @@
 
 #import <WebCore/WebCoreTextRenderer.h>
 
-#if __ppc__ || __ppc64__
+#if defined(__ppc__) || defined(__ppc64__)
 #define PROCESSOR "PPC"
-#elif __i386__ || __x86_64__
+#elif defined(__i386__) || defined(__x86_64__)
 #define PROCESSOR "Intel"
 #else
 #error Unknown architecture