[Mplayer-cvslog] CVS: main/libdha/sysdep AsmMacros_x86.h, 1.4, 1.5 pci_linux.c, 1.8, 1.9

[Atmosfear]

CVS change done by Atmosfear

Update of /cvsroot/mplayer/main/libdha/sysdep
In directory mail:/var2/tmp/cvs-serv25842

Modified Files:
	AsmMacros_x86.h pci_linux.c 
Log Message:
svgalib 1.9.18 compile fix, still wont work for me though...

Index: AsmMacros_x86.h
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/sysdep/AsmMacros_x86.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AsmMacros_x86.h	2 Oct 2003 14:48:17 -0000	1.4
+++ AsmMacros_x86.h	28 Mar 2004 16:30:08 -0000	1.5
@@ -25,6 +25,16 @@
 #include <sys/ioctl.h>
 #include <svgalib_helper.h>
 
+#ifndef SVGALIB_HELPER_IOC_MAGIC
+/* svgalib 1.9.18+ compatibility ::atmos */
+#define SVGALIB_HELPER_IOCSOUTB	SVGAHELPER_OUTB
+#define SVGALIB_HELPER_IOCSOUTW	SVGAHELPER_OUTW
+#define SVGALIB_HELPER_IOCSOUTL	SVGAHELPER_OUTL
+#define SVGALIB_HELPER_IOCGINB	SVGAHELPER_INB
+#define SVGALIB_HELPER_IOCGINW	SVGAHELPER_INW
+#define SVGALIB_HELPER_IOCGINL	SVGAHELPER_INL
+#endif
+
 extern int svgahelper_fd;
 extern int svgahelper_initialized;
 

Index: pci_linux.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/sysdep/pci_linux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pci_linux.c	13 Nov 2003 20:53:09 -0000	1.8
+++ pci_linux.c	28 Mar 2004 16:30:08 -0000	1.9
@@ -26,6 +26,10 @@
 #include <linux/ioctl.h>
 #endif
 #include <fcntl.h>
+#ifndef SVGALIB_HELPER_IOC_MAGIC
+/* svgalib 1.9.18+ compatibility ::atmos */
+#define SVGALIB_HELPER_IOCGPCIINL SVGAHELPER_PCIINL
+#endif
 int svgahelper_initialized = 0;
 int svgahelper_fd = 0;