Commit d56e0692 authored by levin@chromium.org's avatar levin@chromium.org

PLATFORM(CFNETWORK) should be USE(CFNETWORK).

https://bugs.webkit.org/show_bug.cgi?id=28713

Patch by David Levin <levin@chromium.org> on 2009-08-25
Reviewed by Adam Roben.

JavaScriptCore:

* wtf/Platform.h: Added a #define to catch this issue in the
future. The define would generate an error on gcc without the
space in the expansion, but Visual C++ needs the space to cause an error.

WebKit/win:

Also, moved the #if header section after the other #includes.

* WebError.cpp:
(WebError::localizedDescription):

WebKitTools:

* DumpRenderTree/win/DumpRenderTree.cpp:
(main):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@47751 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7746d9a7
2009-08-25 David Levin <levin@chromium.org>
Reviewed by Adam Roben.
PLATFORM(CFNETWORK) should be USE(CFNETWORK).
https://bugs.webkit.org/show_bug.cgi?id=28713
* wtf/Platform.h: Added a #define to catch this issue in the
future. The define would generate an error on gcc without the
space in the expansion, but Visual C++ needs the space to cause an error.
2009-08-24 Brent Fulgham <bfulgham@webkit.org>
Reviewed by Steve Falkenburg.
......
......@@ -759,4 +759,7 @@
#define WARN_UNUSED_RETURN
#endif
/* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
#define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
#endif /* WTF_Platform_h */
2009-08-25 David Levin <levin@chromium.org>
Reviewed by Adam Roben.
PLATFORM(CFNETWORK) should be USE(CFNETWORK).
https://bugs.webkit.org/show_bug.cgi?id=28713
Also, moved the #if header section after the other #includes.
* WebError.cpp:
(WebError::localizedDescription):
2009-08-24 Brent Fulgham <bfulgham@webkit.org>
Reviewed by Steve Falkenburg.
......
......@@ -137,7 +137,7 @@ HRESULT STDMETHODCALLTYPE WebError::localizedDescription(
*result = BString(m_error.localizedDescription()).release();
#if PLATFORM(CFNETWORK)
#if USE(CFNETWORK)
if (!*result) {
if (int code = m_error.errorCode())
*result = BString(wkCFNetworkErrorGetLocalizedDescription(code)).release();
......
2009-08-25 David Levin <levin@chromium.org>
Reviewed by Adam Roben.
PLATFORM(CFNETWORK) should be USE(CFNETWORK).
https://bugs.webkit.org/show_bug.cgi?id=28713
* DumpRenderTree/win/DumpRenderTree.cpp:
(main):
2009-08-25 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Ariya Hidayat.
......
......@@ -50,14 +50,15 @@
#include <wtf/RetainPtr.h>
#include <wtf/Vector.h>
#include <windows.h>
#if PLATFORM(CFNETWORK)
#include <CFNetwork/CFURLCachePriv.h>
#endif
#include <CoreFoundation/CoreFoundation.h>
#include <JavaScriptCore/JavaScriptCore.h>
#include <WebKit/WebKit.h>
#include <WebKit/WebKitCOMAPI.h>
#if USE(CFNETWORK)
#include <CFNetwork/CFURLCachePriv.h>
#endif
using namespace std;
#ifndef NDEBUG
......@@ -1061,7 +1062,7 @@ IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
return webView;
}
#if PLATFORM(CFNETWORK)
#if USE(CFNETWORK)
RetainPtr<CFURLCacheRef> sharedCFURLCache()
{
HMODULE module = GetModuleHandle(TEXT("CFNetwork_debug.dll"));
......@@ -1151,7 +1152,7 @@ int main(int argc, char* argv[])
if (FAILED(webView->mainFrame(&frame)))
return -1;
#if PLATFORM(CFNETWORK)
#if USE(CFNETWORK)
RetainPtr<CFURLCacheRef> urlCache = sharedCFURLCache();
CFURLCacheRemoveAllCachedResponses(urlCache.get());
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment