Undef FloatToFixed and FixedToFloat as well in SkConvolver to avoid confusion with...

BUG=skia:
R=reed@google.com

Author: george@mozilla.com

Review URL: https://codereview.chromium.org/326623004

diff --git a/src/core/SkConvolver.h b/src/core/SkConvolver.h
index 94a5e91..8e53da2 100644 (file)
--- a/src/core/SkConvolver.h
+++ b/src/core/SkConvolver.h
@@ -13,6 +13,8 @@
 #if defined(__APPLE__)
 #undef FloatToConvolutionFixed
 #undef ConvolutionFixedToFloat
+#undef FloatToFixed
+#undef FixedToFloat
 #endif
 
 // Represents a filter in one dimension. Each output pixel has one entry in this