summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-10 15:25:18 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-10 15:25:18 +0000
commitf3750b3846cc639d75046be16826ff1cf109d76e (patch)
tree87279e619ca483638375d5e3ba2df196868df08e /skia
parent5c4d7f97f418c51eccb8f4cfac27c63100b3a0d8 (diff)
downloadchromium_src-f3750b3846cc639d75046be16826ff1cf109d76e.zip
chromium_src-f3750b3846cc639d75046be16826ff1cf109d76e.tar.gz
chromium_src-f3750b3846cc639d75046be16826ff1cf109d76e.tar.bz2
Use crappy apple define instead of OS_ defines since those don't exist for Skia.
Review URL: http://codereview.chromium.org/13709 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/convolver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ext/convolver.h b/skia/ext/convolver.h
index 7e9749a..2932a29 100644
--- a/skia/ext/convolver.h
+++ b/skia/ext/convolver.h
@@ -8,7 +8,7 @@
#include <vector>
// avoid confusion with Mac OS X's math library (Carbon)
-#if defined(OS_MACOSX)
+#if defined(__APPLE__)
#undef FloatToFixed
#endif