Undef FloatToFixed and FixedToFloat as well in SkConvolver to avoid confusion with OS X's maths lib…

src/core/SkConvolver.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SK_CONVOLVER_H
 #define SK_CONVOLVER_H
 
 #include "SkSize.h"
 #include "SkTypes.h"
 #include "SkTArray.h"
 
 // avoid confusion with Mac OS X's math library (Carbon)
 #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
 // object for the filter values contributing to it. You build up the filter
 // list by calling AddFilter for each output pixel (in order).
 //
 // We do 2-dimensional convolution by first convolving each row by one
 // SkConvolutionFilter1D, then convolving each column by another one.
 //
 // Entries are stored in ConvolutionFixed point, shifted left by kShiftBits.
@@ skipping 168 matching lines @@
     int sourceByteRowStride,
     bool sourceHasAlpha,
     const SkConvolutionFilter1D& xfilter,
     const SkConvolutionFilter1D& yfilter,
     int outputByteRowStride,
     unsigned char* output,
     const SkConvolutionProcs&,
     bool useSimdIfPossible);
 
 #endif  // SK_CONVOLVER_H