From 3be8007107a6e4bad3f1b7ea9ea80b51a2dddfc4 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Wed, 19 Jan 2011 11:07:28 -0700 Subject: [PATCH] Fix merge error hiding mmap ioengine under Windows build Signed-off-by: Jens Axboe --- options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/options.c b/options.c index 163e5089..67d0d2dd 100644 --- a/options.c +++ b/options.c @@ -946,12 +946,12 @@ static struct fio_option options[FIO_MAX_OPTS] = { #endif #ifdef FIO_HAVE_WINDOWSAIO { .ival = "windowsaio", - .help = "Windows native asynchronous IO" + .help = "Windows native asynchronous IO" }, +#endif { .ival = "mmap", .help = "Memory mapped IO" }, -#endif #ifdef FIO_HAVE_SPLICE { .ival = "splice", .help = "splice/vmsplice based IO", -- 2.25.1