Index: src/core/SkBitmapProcState.cpp |
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp |
index fc749116df02a003933f21905aafac245b7b75c3..33dd8f5194e938891ef32731ec5901f4073e4521 100644 |
--- a/src/core/SkBitmapProcState.cpp |
+++ b/src/core/SkBitmapProcState.cpp |
@@ -19,7 +19,7 @@ |
#include "SkImageEncoder.h" |
#include "SkResourceCache.h" |
-#if !SK_ARM_NEON_IS_NONE |
+#if defined(SK_ARM_HAS_NEON) |
// These are defined in src/opts/SkBitmapProcState_arm_neon.cpp |
extern const SkBitmapProcState::SampleProc32 gSkBitmapProcStateSample32_neon[]; |
extern void S16_D16_filter_DX_neon(const SkBitmapProcState&, const uint32_t*, int, uint16_t*); |
@@ -296,7 +296,7 @@ bool SkBitmapProcState::chooseScanlineProcs(bool trivialMatrix, bool clampClamp) |
return false; |
} |
-#if !SK_ARM_NEON_IS_ALWAYS |
+#if !defined(SK_ARM_HAS_NEON) |
static const SampleProc32 gSkBitmapProcStateSample32[] = { |
S32_opaque_D32_nofilter_DXDY, |
S32_alpha_D32_nofilter_DXDY, |