Fix CPP logic for the __APPLE__ case. Fixes Darwin 32-bit build.

3 files changed, 9 insertions, 9 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index 3207a703823..1c982e4ddde 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2014/06/25 15:26:40 ryoon Exp $
+$NetBSD: distinfo,v 1.45 2014/06/30 11:08:54 jperkin Exp $
 
 SHA1 (pulseaudio-5.0.tar.xz) = e420931a0b9cf37331cd06e30ba415046317ab85
 RMD160 (pulseaudio-5.0.tar.xz) = 4ba13e92c58f8ada4542d521131094a55e3b6991
@@ -12,7 +12,7 @@ SHA1 (patch-src_daemon_main.c) = e87f764d18345056210427bea52bf27f3f2999b6
 SHA1 (patch-src_modules_module-detect.c) = 25c803ee2d5addf9dbf522d81bd422dc201d4550
 SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7
 SHA1 (patch-src_pulsecore_sample-util.h) = b6bd83cfdc1c337453d9a728f07205a2cf0af831
-SHA1 (patch-src_pulsecore_svolume__mmx.c) = b500530bcc9792b97050c7fa6e47639ac8e261a2
-SHA1 (patch-src_pulsecore_svolume__sse.c) = 07da6faa8529d7308d8a6a9f11958ef9faf46409
+SHA1 (patch-src_pulsecore_svolume__mmx.c) = 57935e4f44f65f062a3669e8ab2749c08c3c4d84
+SHA1 (patch-src_pulsecore_svolume__sse.c) = 1cf7c9cdf1c97d4b6d50b4a5118cc21ce236edc8
 SHA1 (patch-src_tests_mult-s16-test.c) = 3a0fbec804ebefbd88688e84b8d45e0aca597b84
 SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c
index 30c229388d3..b0b5c1e7a49 100644
--- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c
+++ b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.2 2014/06/09 13:08:19 ryoon Exp $
+$NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.3 2014/06/30 11:08:54 jperkin Exp $
 
 Avoid bad register usage on OSX 32-bit.
 
@@ -9,7 +9,7 @@ Avoid bad register usage on OSX 32-bit.
  #include "sample-util.h"
  
 -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) || defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
++#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
  /* in s: 2 int16_t samples
   * in v: 2 int32_t volumes, fixed point 16:16
   * out s: contains scaled and clamped int16_t samples.
@@ -18,7 +18,7 @@ Avoid bad register usage on OSX 32-bit.
  
  void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) {
 -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) || defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
++#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
      if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) {
          pa_log_info("Initialising MMX optimized volume functions.");
  
diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c
index b091b80c599..96f70dbab6a 100644
--- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c
+++ b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.2 2014/06/09 13:08:19 ryoon Exp $
+$NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.3 2014/06/30 11:08:54 jperkin Exp $
 
 Avoid bad register usage on OSX 32-bit.
 
@@ -9,7 +9,7 @@ Avoid bad register usage on OSX 32-bit.
  #include "sample-util.h"
  
 -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) || defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
++#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
  
  #define VOLUME_32x16(s,v)                  /* .. |   vh  |   vl  | */                   \
        " pxor %%xmm4, %%xmm4          \n\t" /* .. |    0  |    0  | */                   \
@@ -18,7 +18,7 @@ Avoid bad register usage on OSX 32-bit.
  
  void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) {
 -#if (!defined(__FreeBSD__) && defined (__i386__)) || defined (__amd64__)
-+#if ((!defined(__FreeBSD__) || defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
++#if ((!defined(__FreeBSD__) && !defined(__APPLE__)) && defined (__i386__)) || defined (__amd64__)
      if (flags & PA_CPU_X86_SSE2) {
          pa_log_info("Initialising SSE2 optimized volume functions.");