Reapply Daniel Bates's build fix from r105847 after the exact same issue was reintrod...

Attempt to fix Mac build after changeset <http://trac.webkit.org/changeset/105930>.
(https://bugs.webkit.org/show_bug.cgi?id=75049)

Don't include NotImplemented.h in KURL.h since NotImplemented.h includes Logging.h, which defines
LOG_CHANNEL_PREFIX to be "Log". And this conflicts with the inclusion of WebKitLogging.h in
WebHTMLView.mm (which would have defined LOG_CHANNEL_PREFIX to be "WebKitLog").

* platform/KURL.h:
(WebCore::KURL::innerURL):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 1763390..4eb9ace 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-01-25  Mark Rowe  <mrowe@apple.com>
+
+        Reapply Daniel Bates's build fix from r105847 after the exact same issue was reintroduced in r105930.
+        
+        Attempt to fix Mac build after changeset <http://trac.webkit.org/changeset/105930>.
+        (https://bugs.webkit.org/show_bug.cgi?id=75049)
+
+        Don't include NotImplemented.h in KURL.h since NotImplemented.h includes Logging.h, which defines
+        LOG_CHANNEL_PREFIX to be "Log". And this conflicts with the inclusion of WebKitLogging.h in
+        WebHTMLView.mm (which would have defined LOG_CHANNEL_PREFIX to be "WebKitLog").
+
+        * platform/KURL.h:
+        (WebCore::KURL::innerURL):
+
 2012-01-25  Eric Seidel  <eric@webkit.org>
 
         Unreviewed, rolling out r105940.

diff --git a/Source/WebCore/platform/KURL.h b/Source/WebCore/platform/KURL.h
index 3b540eb..9afced5 100644 (file)
--- a/Source/WebCore/platform/KURL.h
+++ b/Source/WebCore/platform/KURL.h
@@ -26,7 +26,6 @@
 #ifndef KURL_h
 #define KURL_h
 
-#include "NotImplemented.h"
 #include "PlatformString.h"
 #include "URLString.h"
 #include <wtf/HashMap.h>
@@ -223,7 +222,7 @@ public:
 #if USE(GOOGLEURL)
     const KURL* innerURL() const { return m_url.innerURL(); }
 #else
-    const KURL* innerURL() const { notImplemented(); return 0; }
+    const KURL* innerURL() const { return 0; }
 #endif
 
 #ifndef NDEBUG