Mercurial > mplayer.hg

changeset 35884:edd8273dc025

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hacks to fix compilation on/for Android.
author reimar
date Sat, 16 Mar 2013 13:38:30 +0000
parents 804c3926503b
children 3389262720da
files libvo/vo_fbdev.c stream/stream_dvd_common.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_fbdev.c	Sat Mar 16 10:32:42 2013 +0000
+++ b/libvo/vo_fbdev.c	Sat Mar 16 13:38:30 2013 +0000
@@ -32,7 +32,11 @@
 
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#ifdef __ANDROID__
+#include <linux/kd.h>
+#else
 #include <sys/kd.h>
+#endif
 #include <linux/fb.h>
 
 #include "config.h"
--- a/stream/stream_dvd_common.c	Sat Mar 16 10:32:42 2013 +0000
+++ b/stream/stream_dvd_common.c	Sat Mar 16 13:38:30 2013 +0000
@@ -29,7 +29,9 @@
 
 #ifdef __linux__
 #include <linux/cdrom.h>
+#ifndef __ANDROID__
 #include <scsi/sg.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>