diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/platform/FileSystem.h | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/platform/FileSystem.h')
| -rw-r--r-- | WebCore/platform/FileSystem.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/FileSystem.h b/WebCore/platform/FileSystem.h index 3220d51..c5395a9 100644 --- a/WebCore/platform/FileSystem.h +++ b/WebCore/platform/FileSystem.h @@ -54,7 +54,7 @@ typedef const struct __CFData* CFDataRef; -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) // These are to avoid including <winbase.h> in a header for Chromium typedef void *HANDLE; // Assuming STRICT @@ -67,7 +67,7 @@ namespace WebCore { class CString; // PlatformModule -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) typedef HMODULE PlatformModule; #elif PLATFORM(QT) #if defined(Q_WS_MAC) @@ -84,7 +84,7 @@ typedef void* PlatformModule; #endif // PlatformModuleVersion -#if PLATFORM(WIN_OS) +#if OS(WINDOWS) struct PlatformModuleVersion { unsigned leastSig; unsigned mostSig; @@ -110,7 +110,7 @@ typedef unsigned PlatformModuleVersion; #if PLATFORM(QT) typedef QFile* PlatformFileHandle; const PlatformFileHandle invalidPlatformFileHandle = 0; -#elif PLATFORM(WIN_OS) +#elif OS(WINDOWS) typedef HANDLE PlatformFileHandle; // FIXME: -1 is INVALID_HANDLE_VALUE, defined in <winbase.h>. Chromium tries to // avoid using Windows headers in headers. We'd rather move this into the .cpp. |