summaryrefslogtreecommitdiffstats
path: root/dvdread
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-13 11:23:15 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-13 11:23:15 +0000
commit2648d4d5dc3d4780e865f749fb896f499c57d18d (patch)
tree97cf0a71b8ccd565388fefef37e79d01a0872e84 /dvdread
parentfa5ab5c2571cdef6d238880b50e8b26f2b101651 (diff)
downloadmpv-2648d4d5dc3d4780e865f749fb896f499c57d18d.tar.bz2
mpv-2648d4d5dc3d4780e865f749fb896f499c57d18d.tar.xz
__CPU__ will be x86-64 under amd64 and fail the check "#if __CPU__ > 386".
patch by Zuxy Meng, zuxy.meng gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21608 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dvdread')
-rw-r--r--dvdread/bswap.h2
-rw-r--r--dvdread/libdvdread_changes.diff2
2 files changed, 2 insertions, 2 deletions
diff --git a/dvdread/bswap.h b/dvdread/bswap.h
index a30061b323..c612025b31 100644
--- a/dvdread/bswap.h
+++ b/dvdread/bswap.h
@@ -82,7 +82,7 @@ inline static unsigned short bswap_16(unsigned short x)
inline static unsigned int bswap_32(unsigned int x)
{
__asm(
-#if __CPU__ > 386
+#if __CPU__ != 386
"bswap %0":
"=r" (x) :
#else
diff --git a/dvdread/libdvdread_changes.diff b/dvdread/libdvdread_changes.diff
index b7ba06afa6..5a55acfc39 100644
--- a/dvdread/libdvdread_changes.diff
+++ b/dvdread/libdvdread_changes.diff
@@ -24,7 +24,7 @@ diff -Naur dvdread.orig/bswap.h dvdread/bswap.h
+inline static unsigned int bswap_32(unsigned int x)
+{
+ __asm(
-+#if __CPU__ > 386
++#if __CPU__ != 386
+ "bswap %0":
+ "=r" (x) :
+#else