From 748f1130a5fc046b5042390dd08b27df4b64c0cc Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Fri, 3 Oct 2008 16:46:44 +0000 Subject: Wrap last change in USE_GOOGLE_URL_LIBRARY Review URL: http://codereview.chromium.org/6241 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2833 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/pending/KURL.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webkit/pending/KURL.h b/webkit/pending/KURL.h index eabbb5a..b270a15 100644 --- a/webkit/pending/KURL.h +++ b/webkit/pending/KURL.h @@ -209,7 +209,11 @@ public: operator NSURL*() const; #endif #ifdef __OBJC__ +#ifdef USE_GOOGLE_URL_LIBRARY operator NSString*() const { return string(); } +#else // USE_GOOGLE_URL_LIBRARY + operator NSString*() const { return m_string; } +#endif // USE_GOOGLE_URL_LIBRARY #endif #if PLATFORM(QT) -- cgit v1.1