diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/FileSystem.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/FileSystem.h')
| -rw-r--r-- | Source/WebCore/platform/FileSystem.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/FileSystem.h b/Source/WebCore/platform/FileSystem.h index d923fe6..8b7d0f0 100644 --- a/Source/WebCore/platform/FileSystem.h +++ b/Source/WebCore/platform/FileSystem.h @@ -35,7 +35,7 @@ #include <wtf/Forward.h> #include <wtf/Vector.h> -#if PLATFORM(CF) +#if USE(CF) #include <wtf/RetainPtr.h> #endif @@ -47,7 +47,7 @@ #endif #endif -#if PLATFORM(CF) || (PLATFORM(QT) && defined(Q_WS_MAC)) +#if USE(CF) || (PLATFORM(QT) && defined(Q_WS_MAC)) typedef struct __CFBundle* CFBundleRef; typedef const struct __CFData* CFDataRef; #endif @@ -84,7 +84,7 @@ typedef void* PlatformModule; #endif #elif PLATFORM(GTK) typedef GModule* PlatformModule; -#elif PLATFORM(CF) +#elif USE(CF) typedef CFBundleRef PlatformModule; #else typedef void* PlatformModule; @@ -189,7 +189,7 @@ bool unloadModule(PlatformModule); // Encode a string for use within a file name. String encodeForFileName(const String&); -#if PLATFORM(CF) +#if USE(CF) RetainPtr<CFURLRef> pathAsURL(const String&); #endif |