[MPlayer-cvslog] r35978 - in trunk: libvo/vo_fbdev.c stream/stream_dvd_common.c

[reimar]

Author: reimar
Date: Sat Mar 16 14:38:30 2013
New Revision: 35978

Log:
Hacks to fix compilation on/for Android.

Modified:
   trunk/libvo/vo_fbdev.c
   trunk/stream/stream_dvd_common.c

Modified: trunk/libvo/vo_fbdev.c
==============================================================================
--- trunk/libvo/vo_fbdev.c	Sat Mar 16 11:32:42 2013	(r35977)
+++ trunk/libvo/vo_fbdev.c	Sat Mar 16 14:38:30 2013	(r35978)
@@ -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"

Modified: trunk/stream/stream_dvd_common.c
==============================================================================
--- trunk/stream/stream_dvd_common.c	Sat Mar 16 11:32:42 2013	(r35977)
+++ trunk/stream/stream_dvd_common.c	Sat Mar 16 14:38:30 2013	(r35978)
@@ -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>