From 2c2328d8a0c58fada3595d20f4362847df6f34ae Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Tue, 4 Dec 2012 07:57:31 +0100
Subject: [PATCH] (NEON) Change WANT_NEON define back to HAVE_NEON

---
 android/native/jni/Android.mk | 8 ++++----
 audio/sinc.c                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk
index d318c9e179..de472c0a25 100644
--- a/android/native/jni/Android.mk
+++ b/android/native/jni/Android.mk
@@ -2,7 +2,7 @@ RARCH_VERSION		= "0.9.8-beta3"
 LOCAL_PATH := $(call my-dir)
 PERF_TEST := 1
 HAVE_OPENSL     := 1
-WANT_NEON := 1
+HAVE_NEON := 1
 HAVE_SINC := 1
 
 include $(CLEAR_VARS)
@@ -18,12 +18,12 @@ endif
 
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 
-ifeq ($(WANT_NEON),1)
-LOCAL_CFLAGS += -DWANT_NEON
+ifeq ($(HAVE_NEON),1)
+LOCAL_CFLAGS += -DHAVE_NEON
 endif
 
 ifeq ($(HAVE_SINC),1)
-ifeq ($(WANT_NEON),1)
+ifeq ($(HAVE_NEON),1)
 LOCAL_SRC_FILES += ../../../audio/sinc_neon.S.neon
 endif
 LOCAL_CFLAGS += -DHAVE_SINC
diff --git a/audio/sinc.c b/audio/sinc.c
index 519254d116..e4ab461755 100644
--- a/audio/sinc.c
+++ b/audio/sinc.c
@@ -123,7 +123,7 @@ rarch_resampler_t *resampler_new(void)
    RARCH_LOG("Sinc resampler [AVX]\n");
 #elif defined(__SSE__)
    RARCH_LOG("Sinc resampler [SSE]\n");
-#elif defined(WANT_NEON)
+#elif defined(HAVE_NEON)
    RARCH_LOG("Sinc resampler [NEON]\n");
 #else
    RARCH_LOG("Sinc resampler [C]\n");
@@ -210,7 +210,7 @@ static void process_sinc(rarch_resampler_t *resamp, float *out_buffer)
    // movehl { X, R, X, L } == { X, R, X, R }
    _mm_store_ss(out_buffer + 1, _mm_movehl_ps(sum, sum));
 }
-#elif defined(WANT_NEON)
+#elif defined(HAVE_NEON)
 void process_sinc_neon_asm(float *out, const float *left, const float *right, const float *coeff);
 static void process_sinc(rarch_resampler_t *resamp, float *out_buffer)
 {