From 56c79608286deba515608989bd826aff34c0a211 Mon Sep 17 00:00:00 2001 From: Aaron Carroll Date: Wed, 13 Mar 2013 10:09:10 +0100 Subject: [PATCH] android: fix compile by not defining FIO_NO_HAVE_SHM_H twice Signed-off-by: Jens Axboe --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 -- 2.25.1