diff options
| author | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-13 20:53:40 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-13 20:53:40 +0000 |
| commit | 2f75c8e9d306d8626fdfb066bf0d167463339498 (patch) | |
| tree | cec2802ca89fe71af41882d2022be0b793371b93 /osdep | |
| parent | d911fb37f8c3d78ee89bb3aafa0d08e7d2bebbb8 (diff) | |
| download | mpv-2f75c8e9d306d8626fdfb066bf0d167463339498.tar.bz2 mpv-2f75c8e9d306d8626fdfb066bf0d167463339498.tar.xz | |
cumulative libc5 compatibility patch ;)
- VESA detection by sys/io.h header
- workaround a missing define on libc5
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11456 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/lrmi.c | 4 | ||||
| -rw-r--r-- | osdep/vbelib.c | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/osdep/lrmi.c b/osdep/lrmi.c index c8aac7700c..c04a470f75 100644 --- a/osdep/lrmi.c +++ b/osdep/lrmi.c @@ -11,6 +11,9 @@ This software has NO WARRANTY. Use it at your own risk. Original location: http://cvs.debian.org/lrmi/ */ +#include "../config.h" +#ifdef HAVE_VESA + #include <signal.h> #include <stdio.h> #include <string.h> @@ -918,3 +921,4 @@ LRMI_int(int i, struct LRMI_regs *r) return vret; } +#endif diff --git a/osdep/vbelib.c b/osdep/vbelib.c index 6b446344cb..356a0e3ac3 100644 --- a/osdep/vbelib.c +++ b/osdep/vbelib.c @@ -7,6 +7,10 @@ of GNU General Public licence v2. Written by Nick Kurshev <nickols_k@mail.ru> */ + +#include <../config.h> +#ifdef HAVE_VESA + #include "vbelib.h" #include "lrmi.h" #include <stdlib.h> @@ -728,3 +732,5 @@ void vbeUnmapVideoBuffer(unsigned long linear_addr,unsigned long size) if(verbose > 1) printf("vbelib: vbeUnmapVideoBuffer(%08lX,%08lX)\n",linear_addr,size); munmap((void *)linear_addr,size); } + +#endif |