[vlc-commits] Fix 3d Now! tests compilation

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug  5 12:46:30 2012 +0300| [996bff4779701b249fa61343d24e9984995542d6] | committer: Rémi Denis-Courmont

Fix 3d Now! tests compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=996bff4779701b249fa61343d24e9984995542d6
---

 src/misc/cpu.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index f9927ac..77691dd 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -99,7 +99,7 @@ VLC_SSE static void SSE_test (void)
     asm volatile ("xorps %%xmm0,%%xmm0\n" : : : "xmm0", "xmm1");
 }
 #endif
-#if defined (CAN_COMPILE_3DNOW) && !defined (__3dNOW__)
+#if defined (CAN_COMPILE_3DNOW)
 VLC_MMX static void ThreeD_Now_test (void)
 {
     asm volatile ("pfadd %%mm0,%%mm0\n" "femms\n" : : : "mm0");
@@ -222,10 +222,10 @@ void vlc_CPU_init (void)
     /* list these additional capabilities */
     cpuid( 0x80000001 );
 
-# if defined (CAN_COMPILE_3DNOW)
+# if defined (CAN_COMPILE_3DNOW) && !defined (__3dNOW__)
     if ((i_edx & 0x80000000) && vlc_CPU_check ("3D Now!", ThreeD_Now_test))
-        i_capabilities |= CPU_CAPABILITY_3DNOW;
 # endif
+        i_capabilities |= VLC_CPU_3dNOW;
 
     if( b_amd && ( i_edx & 0x00400000 ) )
         i_capabilities |= VLC_CPU_MMXEXT;