From: Aaron Carroll <xaaronc@gmail.com>
Date: Wed, 13 Mar 2013 09:09:10 +0000 (+0100)
Subject: android: fix compile by not defining FIO_NO_HAVE_SHM_H twice
X-Git-Tag: fio-2.0.15~30
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=56c79608286deba515608989bd826aff34c0a211;hp=8fdb9e22a8eb3cca928b3f44d60a9b710b291064

android: fix compile by not defining FIO_NO_HAVE_SHM_H twice

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/configure b/configure
index d1f277d0..d3649710 100755
--- a/configure
+++ b/configure
@@ -234,7 +234,7 @@ Android)
   output_sym "CONFIG_CLOCK_GETTIME"
   output_sym "CONFIG_CLOCK_MONOTONIC"
   echo "CC=$cc" >> $config_host_mak
-  echo "EXTFLAGS=$CFLAGS -include config-host.h -DFIO_NO_HAVE_SHM_H -D_GNU_SOURCE" >> $config_host_mak
+  echo "EXTFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
   exit 0
 esac
 
@@ -1032,9 +1032,9 @@ fi
 if test "$sched_idle" = "yes" ; then
   output_sym "CONFIG_SCHED_IDLE"
 fi
-if test "$tcp_nodelay" = "yes" ; then
-  output_sym "CONFIG_TCP_NODELAY"
-fi
+#if test "$tcp_nodelay" = "yes" ; then
+  #output_sym "CONFIG_TCP_NODELAY"
+#fi
 if test "$rlimit_memlock" = "yes" ; then
   output_sym "CONFIG_RLIMIT_MEMLOCK"
 fi