From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 27 Aug 2007 09:21:33 +0000 (+0000)
Subject: Simplify preprocessor directives.
X-Git-Tag: android-x86-4.4-r1~35370
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=06b00c5f6594bce7d30ed527faf405260c797cf2;p=android-x86%2Fexternal-ffmpeg.git

Simplify preprocessor directives.

Originally committed as revision 10249 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c
index e95e1fa5de..ca59b9bf26 100644
--- a/libavcodec/ppc/dsputil_altivec.c
+++ b/libavcodec/ppc/dsputil_altivec.c
@@ -1426,9 +1426,7 @@ int has_altivec(void)
     IExec->GetCPUInfoTags(GCIT_VectorUnit, &result, TAG_DONE);
     if (result == VECTORTYPE_ALTIVEC) return 1;
     return 0;
-#else /* __AMIGAOS4__ */
-
-#ifdef __APPLE__
+#elif __APPLE__
     int sels[2] = {CTL_HW, HW_VECTORUNIT};
     int has_vu = 0;
     size_t len = sizeof(has_vu);
@@ -1437,9 +1435,9 @@ int has_altivec(void)
     err = sysctl(sels, 2, &has_vu, &len, NULL, 0);
 
     if (err == 0) return (has_vu != 0);
-#else /* __APPLE__ */
-/* no Mac OS X, do it the brute-force way */
-/* this is borrowed from the libmpeg2 library */
+    return 0;
+#else
+/* Do it the brute-force way, borrowed from the libmpeg2 library. */
     {
       signal (SIGILL, sigill_handler);
       if (sigsetjmp (jmpbuf, 1)) {
@@ -1456,7 +1454,6 @@ int has_altivec(void)
         return 1;
       }
     }
-#endif /* __APPLE__ */
     return 0;
 #endif /* __AMIGAOS4__ */
 }