From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 14:57:50 +0000 Subject: Merge webkit.org at r54127 : Initial merge by git Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 --- WebCore/platform/FileSystem.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'WebCore/platform/FileSystem.h') 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 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 . Chromium tries to // avoid using Windows headers in headers. We'd rather move this into the .cpp. -- cgit v1.1