diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 22:02:52 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 22:02:52 +0000 |
| commit | 72c2575af85a18491ce158e1ff183d5567dd01ef (patch) | |
| tree | 272637dd679d3c91fcb93ca4c3522046d251b1d6 /webkit | |
| parent | 8a2820a90f85f91c500a9d382f8e8ba870fb621c (diff) | |
| download | chromium_src-72c2575af85a18491ce158e1ff183d5567dd01ef.zip chromium_src-72c2575af85a18491ce158e1ff183d5567dd01ef.tar.gz chromium_src-72c2575af85a18491ce158e1ff183d5567dd01ef.tar.bz2 | |
Fix build (Icefox's patch used WebKit ifdefs instead of Chromium ones).
Review URL: http://codereview.chromium.org/7034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webcursor.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webcursor.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/webkit/glue/webcursor.cc b/webkit/glue/webcursor.cc index cccb3a0..ad5c345 100644 --- a/webkit/glue/webcursor.cc +++ b/webkit/glue/webcursor.cc @@ -5,8 +5,8 @@ #include "webkit/glue/webcursor.h" #include "webkit/glue/webkit_resources.h" -#if PLATFORM(WIN) -#include "base/gfx/gdi_util.h" +#if defined(OS_WIN) +#include "base/gfx/bitmap_header.h" #endif WebCursor::WebCursor() @@ -56,7 +56,7 @@ WebCursor& WebCursor::operator=(const WebCursor& other) { } return *this; } -#if PLATFORM(WIN) +#if defined(OS_WIN) HCURSOR WebCursor::GetCursor(HINSTANCE module_handle) const { if (type_ == CUSTOM) return NULL; diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h index ba35c2c..a80d39c 100644 --- a/webkit/glue/webcursor.h +++ b/webkit/glue/webcursor.h @@ -6,7 +6,7 @@ #define WEBCURSOR_H__ #include "skia/include/SkBitmap.h" -#include <wtf/Platform.h> +#include "build/build_config.h" // This class provides the functionality of a generic cursor type. The intent // is to stay away from platform specific code here. We do have win32 specific @@ -70,7 +70,7 @@ public: hotspot_x_ = hotspot_x; hotspot_y_ = hotspot_x; } -#if PLATFORM(WIN) +#if defined(OS_WIN) // Returns the cursor handle. If the cursor type is a win32 or safari // cursor, we use LoadCursor to load the cursor. // Returns NULL on error. |