diff options
| author | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
|---|---|---|
| committer | chromium@hybridsource.org <chromium@hybridsource.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 23:44:58 +0000 |
| commit | 2ec8df5602bedf518d0119005690b101d5b598ef (patch) | |
| tree | 04b9d44fdc22ceab2d10a02108765729062241c4 /ui/gfx/font_unittest.cc | |
| parent | 88efcce0d60e09489d8a3761f4c8fd0d4b51c625 (diff) | |
| download | chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.zip chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.gz chromium_src-2ec8df5602bedf518d0119005690b101d5b598ef.tar.bz2 | |
Made the OS_LINUX ifdefs in ui/ and webkit/ directories more cross-platform, so that these files can be used on multiple POSIX platforms.
Review URL: http://codereview.chromium.org/6990051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/font_unittest.cc')
| -rw-r--r-- | ui/gfx/font_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc index 7ea01db..b8de407 100644 --- a/ui/gfx/font_unittest.cc +++ b/ui/gfx/font_unittest.cc @@ -7,7 +7,7 @@ #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) #include <pango/pango.h> #elif defined(OS_WIN) #include "ui/gfx/platform_font_win.h" @@ -22,7 +22,7 @@ class FontTest : public testing::Test { // Fulfills the memory management contract as outlined by the comment at // gfx::Font::GetNativeFont(). void FreeIfNecessary(gfx::NativeFont font) { -#if defined(OS_LINUX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) pango_font_description_free(font); #endif } |