aboutsummaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun2007-08-27 09:21:33 +0000
committerDiego Biurrun2007-08-27 09:21:33 +0000
commit06b00c5f6594bce7d30ed527faf405260c797cf2 (patch)
tree33f32615bad39c651a0150521a8cfbc4af1265ee /libavcodec
parentd56fb404bb6a3f4c0fc0244066e7896b9e9a6868 (diff)
Simplify preprocessor directives.
Originally committed as revision 10249 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ppc/dsputil_altivec.c11
1 files changed, 4 insertions, 7 deletions
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__ */
}