[GRASS-SVN] r53220 - grass/trunk/lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-09-18 14:18:43 -0700 (Tue, 18 Sep 2012)
New Revision: 53220

Modified:
   grass/trunk/lib/gis/ls.c
Log:
revert r53207 with better fix

Modified: grass/trunk/lib/gis/ls.c
===================================================================
--- grass/trunk/lib/gis/ls.c	2012-09-18 21:03:13 UTC (rev 53219)
+++ grass/trunk/lib/gis/ls.c	2012-09-18 21:18:43 UTC (rev 53220)
@@ -24,14 +24,13 @@
 #include <grass/config.h>
 #include <grass/glocale.h>
 
+#ifdef HAVE_TERMIOS_H
+#  include <termios.h>
+#endif
+
 #ifdef HAVE_SYS_IOCTL_H
-#ifdef __ANDROID__
-#  include <asm/ioctls.h>
-#  include <asm/termios.h>
-#else
 #  include <sys/ioctl.h>
 #endif
-#endif
 
 typedef int ls_filter_func(const char * /*filename */ , void * /*closure */ );