summaryrefslogtreecommitdiffstats
path: root/libdha
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-03 19:17:28 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-09-03 19:17:28 +0000
commit58f99379531d6d7f9c8906a4892cfae62441e10f (patch)
tree44f8feb523c4d2198a1c1b39f646b12ca032ff2c /libdha
parent32f8f95be7f3976172c7a77d4f0bfd1c6a384a22 (diff)
downloadmpv-58f99379531d6d7f9c8906a4892cfae62441e10f.tar.bz2
mpv-58f99379531d6d7f9c8906a4892cfae62441e10f.tar.xz
Make MTRR setup work on AMD64 and simplify some #ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16378 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdha')
-rw-r--r--libdha/mtrr.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/libdha/mtrr.c b/libdha/mtrr.c
index 977ce80477..04f4d5ac3b 100644
--- a/libdha/mtrr.c
+++ b/libdha/mtrr.c
@@ -23,7 +23,6 @@
#endif
#endif
-#if defined( __i386__ )
int mtrr_set_type(unsigned base,unsigned size,int type)
{
#ifdef linux
@@ -50,8 +49,7 @@ int mtrr_set_type(unsigned base,unsigned size,int type)
return wr_len == strlen(sout) ? 0 : EPERM;
}
return ENOSYS;
-#elif defined (__NetBSD__)
-#if __NetBSD_Version__ > 105240000
+#elif defined (__i386__ ) && defined (__NetBSD__) && __NetBSD_Version__ > 105240000
struct mtrr *mtrrp;
int n;
@@ -72,14 +70,4 @@ int mtrr_set_type(unsigned base,unsigned size,int type)
/* NetBSD prior to 1.5Y doesn't have MTRR support */
return ENOSYS;
#endif
-#else
-#warning Please port MTRR stuff!!!
- return ENOSYS;
-#endif
-}
-#else
-int mtrr_set_type(unsigned base,unsigned size,int type)
-{
- return ENOSYS;
}
-#endif