diff options
| author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-10 09:48:15 +0000 |
|---|---|---|
| committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-10 09:48:15 +0000 |
| commit | 3115b22defaaf90560e4c776c468874710df8a01 (patch) | |
| tree | bf9d80f595b4ef80c3dda1504cb2b66e9765773d | |
| parent | c27b831927bfccb6086e107f6ad7329208ac3dbd (diff) | |
| download | mpv-3115b22defaaf90560e4c776c468874710df8a01.tar.bz2 mpv-3115b22defaaf90560e4c776c468874710df8a01.tar.xz | |
linux 2.6 patch by "ismail 'cartman' dönmez" <ismail.donmez@boun.edu.tr>
no idea whether this really works :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11766 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/Makefile | 2 | ||||
| -rw-r--r-- | libvo/vo_fbdev.c | 1 | ||||
| -rw-r--r-- | libvo/vo_fbdev2.c | 1 | ||||
| -rw-r--r-- | libvo/vo_mga.c | 1 | ||||
| -rw-r--r-- | osdep/kerneltwosix.h | 9 |
5 files changed, 13 insertions, 1 deletions
diff --git a/libvo/Makefile b/libvo/Makefile index 482d0c38e6..85b51dface 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -10,7 +10,7 @@ ifeq ($(VIDIX),yes) SRCS += vosub_vidix.c endif -CFLAGS = $(OPTFLAGS) -I. -I.. $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall +CFLAGS = $(OPTFLAGS) -I. -I.. -I../osdep $(FREETYPE_INC) $(SDL_INC) $(X11_INC) $(EXTRA_INC) $(DXR2_INC) $(DIRECTFB_INC) -DMPG12PLAY #-Wall .SUFFIXES: .c .o diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index 5764dfc239..8df2d61c7b 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -18,6 +18,7 @@ #include <sys/mman.h> #include <sys/ioctl.h> #include <sys/kd.h> +#include "kerneltwosix.h" #include <linux/fb.h> #include "config.h" diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c index 630139a6e7..83112ddd86 100644 --- a/libvo/vo_fbdev2.c +++ b/libvo/vo_fbdev2.c @@ -13,6 +13,7 @@ #include <sys/mman.h> #include <sys/ioctl.h> +#include "kerneltwosix.h" #include <linux/fb.h> #include "config.h" diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c index 9861c95ed2..0c3fd8e2bf 100644 --- a/libvo/vo_mga.c +++ b/libvo/vo_mga.c @@ -14,6 +14,7 @@ #include <unistd.h> #include <fcntl.h> #include <sys/mman.h> +#include "kerneltwosix.h" #include <linux/fb.h> #include "drivers/mga_vid.h" diff --git a/osdep/kerneltwosix.h b/osdep/kerneltwosix.h new file mode 100644 index 0000000000..dcb808d934 --- /dev/null +++ b/osdep/kerneltwosix.h @@ -0,0 +1,9 @@ +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) +#define __KERNEL__ +#include <linux/thread_info.h> +#include <linux/list.h> +#undef __KERNEL__ +#endif + + |