| Index: include/core/SkFloatBits.h
 | 
| diff --git a/include/core/SkFloatBits.h b/include/core/SkFloatBits.h
 | 
| index a1196caca7fc119672b71fc39644dc0cea9e9469..552e712f53e5a467755e0954278fa76fa79f4915 100644
 | 
| --- a/include/core/SkFloatBits.h
 | 
| +++ b/include/core/SkFloatBits.h
 | 
| @@ -127,12 +127,7 @@ static inline int32_t SkFloatToIntCeil(float x) {
 | 
|  
 | 
|  //  Scalar wrappers for float-bit routines
 | 
|  
 | 
| -#ifdef SK_SCALAR_IS_FLOAT
 | 
| -    #define SkScalarAs2sCompliment(x)    SkFloatAs2sCompliment(x)
 | 
| -    #define Sk2sComplimentAsScalar(x)    Sk2sComplimentAsFloat(x)
 | 
| -#else
 | 
| -    #define SkScalarAs2sCompliment(x)    (x)
 | 
| -    #define Sk2sComplimentAsScalar(x)    (x)
 | 
| -#endif
 | 
| +#define SkScalarAs2sCompliment(x)    SkFloatAs2sCompliment(x)
 | 
| +#define Sk2sComplimentAsScalar(x)    Sk2sComplimentAsFloat(x)
 | 
|  
 | 
|  #endif
 | 
| 
 |