From d0825bca7fe65beaee391d30da42e937db621564 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 2 Feb 2010 14:57:50 +0000
Subject: Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
---
 WebCore/platform/wx/FileSystemWx.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'WebCore/platform/wx/FileSystemWx.cpp')

diff --git a/WebCore/platform/wx/FileSystemWx.cpp b/WebCore/platform/wx/FileSystemWx.cpp
index 1ee87ae..50ac2ec 100644
--- a/WebCore/platform/wx/FileSystemWx.cpp
+++ b/WebCore/platform/wx/FileSystemWx.cpp
@@ -42,7 +42,7 @@
 #include <wx/filefn.h>
 #include <wx/filename.h>
 
-#if PLATFORM(DARWIN)
+#if OS(DARWIN)
 #include <CoreFoundation/CoreFoundation.h>
 #endif
 
@@ -127,9 +127,9 @@ int writeToFile(PlatformFileHandle, const char* data, int length)
 
 bool unloadModule(PlatformModule mod)
 {
-#if PLATFORM(WIN_OS)
+#if OS(WINDOWS)
     return ::FreeLibrary(mod);
-#elif PLATFORM(DARWIN)
+#elif OS(DARWIN)
     CFRelease(mod);
     return true;
 #else
-- 
cgit v1.1