diff options
| author |  atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-28 16:30:08 +0000 |
|---|---|---|
| committer | atmos4 <atmos4@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-28 16:30:08 +0000 |
| commit | 838493bf7d4c09b05ee20e1959cca6be55123dce (patch) | |
| tree | 81ef4080c15faf9864290234165d0121c1fd7b6b /libdha | |
| parent | e294c7134c3a9d69d9b7dd16cf0ccd8fb87bcb80 (diff) | |
svgalib 1.9.18 compile fix, still wont work for me though...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12079 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdha')
| -rw-r--r-- | libdha/sysdep/AsmMacros_x86.h | 10 | ||||
| -rw-r--r-- | libdha/sysdep/pci_linux.c | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libdha/sysdep/AsmMacros_x86.h b/libdha/sysdep/AsmMacros_x86.h index 3259de03f9..c2ab1dc217 100644 --- a/libdha/sysdep/AsmMacros_x86.h +++ b/libdha/sysdep/AsmMacros_x86.h @@ -25,6 +25,16 @@ extern int dhahelper_initialized; #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; diff --git a/libdha/sysdep/pci_linux.c b/libdha/sysdep/pci_linux.c index a4486dd041..7d27fc073f 100644 --- a/libdha/sysdep/pci_linux.c +++ b/libdha/sysdep/pci_linux.c @@ -26,6 +26,10 @@ int dhahelper_fd = 0; #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; |