From 247e24728016f366f80bda88a3d4b8d7efd2dafe Mon Sep 17 00:00:00 2001
From: "awalker@google.com"
 <awalker@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 20 Aug 2008 19:34:30 +0000
Subject: Merges in updated versions of Mac graphics platform classes, adds
 generic typedefs for use by higher level classes that just need to hold a
 reference (though does not yet refactor those classes).

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1099 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/gfx/convolver.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'base/gfx/convolver.h')

diff --git a/base/gfx/convolver.h b/base/gfx/convolver.h
index 8a2310e..2cb91af 100644
--- a/base/gfx/convolver.h
+++ b/base/gfx/convolver.h
@@ -34,6 +34,11 @@
 
 #include "base/basictypes.h"
 
+// avoid confusion with Mac OS X's math library (Carbon)
+#if defined(OS_MACOSX)
+#undef FloatToFixed
+#endif
+
 namespace gfx {
 
 // Represents a filter in one dimension. Each output pixel has one entry in this
-- 
cgit v1.1