diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-31 01:03:52 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-31 01:03:52 +0000 |
| commit | 10a6e77b356565b7c8d18812747b261f0605aae4 (patch) | |
| tree | 669258341cb2099c6be4d7d5909bcebb0307dcc4 /webkit/glue/webkit_glue.cc | |
| parent | b7b412a5ee120091770e9c8bd10b5cb17a8a9aa4 (diff) | |
| download | chromium_src-10a6e77b356565b7c8d18812747b261f0605aae4.zip chromium_src-10a6e77b356565b7c8d18812747b261f0605aae4.tar.gz chromium_src-10a6e77b356565b7c8d18812747b261f0605aae4.tar.bz2 | |
bsds: views/ and webkit/ support for FreeBSD/OpenBSD
- add a TOOLKIT_USES_GTK #define to catch GTK and Views+GTK
- lots of ifdef twiddling
Review URL: http://codereview.chromium.org/519030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 0b3c39b..38c0e12 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -8,7 +8,7 @@ #if defined(OS_WIN) #include <objidl.h> #include <mlang.h> -#elif defined(OS_LINUX) || defined(OS_FREEBSD) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) #include <sys/utsname.h> #endif @@ -368,7 +368,7 @@ std::string BuildOSCpuInfo() { &os_minor_version, &os_bugfix_version); #endif -#if !defined(OS_WIN) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) // Should work on any Posix system. struct utsname unixinfo; uname(&unixinfo); @@ -421,7 +421,7 @@ void BuildUserAgent(bool mimic_chrome1, bool mimic_windows, "Windows"; #elif defined(OS_MACOSX) "Macintosh"; -#elif defined(OS_LINUX) +#elif defined(USE_X11) "X11"; // strange, but that's what Firefox uses #else "?"; @@ -499,7 +499,7 @@ const std::string& GetUserAgent(const GURL& url) { BuildUserAgent(true, false, &g_user_agent->mimic_chrome1_user_agent); return g_user_agent->mimic_chrome1_user_agent; } -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) else if (MatchPatternASCII(url.host(), "*.mail.yahoo.com")) { // mail.yahoo.com is ok with Windows Chrome but not Linux Chrome. // http://bugs.chromium.org/11136 |