[Mplayer-cvslog] CVS: main/libdha mtrr.c,1.4,1.5

pl pl at mplayerhq.hu
Tue May 7 23:51:49 CEST 2002


Update of /cvsroot/mplayer/main/libdha
In directory mail:/var/tmp.root/cvs-serv12315/libdha

Modified Files:
	mtrr.c 
Log Message:
patchs for NetBSD by Bernd Ernesti <mplayer at lists.veego.de>:
- the libmpdvdkit auto check works fine after adding the netbsd check to the linux
  and freebsd one
- NetBSD only support MTRR after 1.5X, so libdha/mtrr.c needs a small patch
  to only enable it for versions after 1.5X.


Index: mtrr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/mtrr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mtrr.c	27 Apr 2002 22:42:24 -0000	1.4
+++ mtrr.c	7 May 2002 21:51:47 -0000	1.5
@@ -13,11 +13,14 @@
 #include "AsmMacros.h"
 
 #if defined (__i386__) && defined (__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Version__ > 105240000
 #include <stdint.h>
 #include <stdlib.h>
 #include <machine/mtrr.h>
 #include <machine/sysarch.h>
 #endif
+#endif
 
 #if defined( __i386__ )
 int	mtrr_set_type(unsigned base,unsigned size,int type)
@@ -47,6 +50,7 @@
     }
     return ENOSYS;
 #elif defined (__NetBSD__)
+#if __NetBSD_Version__ > 105240000
     struct mtrr *mtrrp;
     int n;
 
@@ -63,6 +67,10 @@
     }
     free(mtrrp);
     return 0;
+#else
+    /* NetBSD prior to 1.5Y doesn't have MTRR support */
+    return ENOSYS;
+#endif
 #else
 #warning Please port MTRR stuff!!!
     return ENOSYS;




More information about the MPlayer-cvslog mailing list