Mercurial > mplayer.hg
changeset 12078:62705b2298ff
svgalib 1.9.18 compile fix, still wont work for me though...
| author | atmos4 |
|---|---|
| date | Sun, 28 Mar 2004 16:30:08 +0000 |
| parents | e200b0e11e9c |
| children | c931c69d2525 |
| files | libdha/sysdep/AsmMacros_x86.h libdha/sysdep/pci_linux.c |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libdha/sysdep/AsmMacros_x86.h Sun Mar 28 14:44:49 2004 +0000 +++ b/libdha/sysdep/AsmMacros_x86.h Sun Mar 28 16:30:08 2004 +0000 @@ -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;
--- a/libdha/sysdep/pci_linux.c Sun Mar 28 14:44:49 2004 +0000 +++ b/libdha/sysdep/pci_linux.c Sun Mar 28 16:30:08 2004 +0000 @@ -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;