Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: src/core/SkConvolver.h

Issue 326623004: Undef FloatToFixed and FixedToFloat as well in SkConvolver to avoid confusion with OS X's maths lib… (Closed) Base URL: https://skia.googlesource.com/skia.git@header-guards
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkConvolver.h
diff --git a/src/core/SkConvolver.h b/src/core/SkConvolver.h
index 94a5e91598782c413d0640379d3afa0eec636257..8e53da2d4231befebe3f534309b9aba99bb01d24 100644
--- 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698