On 12 March 2013 18:06, <olegmatcovsky@xxxxxxxxx> wrote: > From: Oleg <olegm@olegm-vmware.(none)> > > Signed-off-by: Oleg Matcovschi <olegmatcovsky@xxxxxxxxx> > --- > backend.c | 6 +++--- > init.c | 7 ++++--- > memory.c | 6 +++--- > os/os-android.h | 4 ++++ > 4 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/backend.c b/backend.c > index d1fe964..e482fb8 100644 > --- a/backend.c > +++ b/backend.c > @@ -34,12 +34,12 @@ > #include <sys/stat.h> > #include <sys/wait.h> > #include <sys/ipc.h> > -#ifndef FIO_NO_HAVE_SHM_H > -#include <sys/shm.h> > -#endif > #include <sys/mman.h> > > #include "fio.h" > +#ifndef FIO_NO_HAVE_SHM_H > +#include <sys/shm.h> > +#endif > #include "hash.h" > #include "smalloc.h" > #include "verify.h" Hmm, well that's broken the build. The following should be applied to avoid double definition. diff --git a/configure b/configure index d1f277d..1827e02 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 -- To unsubscribe from this list: send the line "unsubscribe fio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
