OSDN Git Service

do not define HAVE_EJECT_SCSI to fix a compiling issue donut-x86 eclair-x86 froyo-x86 android-x86-2.2 android-x86-2.2-r2
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 12 Mar 2010 09:20:36 +0000 (17:20 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 12 Mar 2010 09:21:36 +0000 (17:21 +0800)
eject.c

diff --git a/eject.c b/eject.c
index 300e3df..5a149c6 100644 (file)
--- a/eject.c
+++ b/eject.c
@@ -48,7 +48,9 @@
 #include <getopt.h>
 #endif /* GETOPTLONG */
 #include <errno.h>
+#ifndef ANDROID
 #include <regex.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <linux/ucdrom.h>
 #endif
 #include <linux/fd.h>
+#ifndef ANDROID
 #include <scsi/scsi.h>
 #include <scsi/sg.h>
 #include <scsi/scsi_ioctl.h>
+#endif
 #include <sys/time.h>
 
 /* Used by the ToggleTray() function. If ejecting the tray takes this
@@ -91,7 +95,9 @@
     exit(1); \
 }
 
+#ifndef ANDROID
 #define HAVE_EJECT_SCSI
+#endif
 #define HAVE_EJECT_FLOPPY
 #define HAVE_EJECT_TAPE