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/wx/FileSystemWx.cpp | |
| 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/wx/FileSystemWx.cpp')
| -rw-r--r-- | WebCore/platform/wx/FileSystemWx.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 |