summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webcursor.h
diff options
context:
space:
mode:
authorbenl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-07 16:39:46 +0000
committerbenl@chromium.org <benl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-07 16:39:46 +0000
commitfb66f9deac79dfe9e0eedc184705e824ae9144c3 (patch)
tree019f94cbb5f93009383182cffe8184009adcb6e6 /webkit/glue/webcursor.h
parentccf440ed5cf9f0a3368457c73a7496a900e03c06 (diff)
downloadchromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.zip
chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.gz
chromium_src-fb66f9deac79dfe9e0eedc184705e824ae9144c3.tar.bz2
Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set but
not OS_WIN. Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set. Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX, OS_LINUX or OS_FREEBSD. Added USE_NSS for ... nss (for crypto). Windows and MacOS use platform-specific libraries. All of the above cause slightly odd formulations like: #if defined(OS_WIN) ... #elif defined(USE_BASE_DATA_PACK) ... #endif Possibly should also define USE_DLL_FOR_DATA, etc? Or something? Wrapped various references to struct stat64 and stat64() to use struct stat and stat() for FreeBSD - but a "man stat64" on Linux suggests that we could do the same thing for at least Linux, too, and perhaps eliminate the wrapper? git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webcursor.h')
-rw-r--r--webkit/glue/webcursor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/webcursor.h b/webkit/glue/webcursor.h
index 86d693f..afd27a5 100644
--- a/webkit/glue/webcursor.h
+++ b/webkit/glue/webcursor.h
@@ -15,7 +15,7 @@
typedef struct HINSTANCE__* HINSTANCE;
typedef struct HICON__* HICON;
typedef HICON HCURSOR;
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
// GdkCursorType is an enum, which we can't forward-declare. :(
// If you work around this, be sure to fix webkit.gyp:glue to not put
// GTK in the export_dependent_settings section!
@@ -77,7 +77,7 @@ class WebCursor {
// APIs on it.
void InitFromExternalCursor(HCURSOR handle);
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
// Return the stock GdkCursorType for this cursor, or GDK_CURSOR_IS_PIXMAP
// if it's a custom cursor. Return GDK_LAST_CURSOR to indicate that the cursor
// should be set to the system default.