From: Jens Axboe Date: Wed, 19 Jan 2011 18:07:28 +0000 (-0700) Subject: Fix merge error hiding mmap ioengine under Windows build X-Git-Tag: fio-1.50-rc4~5 X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=3be8007107a6e4bad3f1b7ea9ea80b51a2dddfc4;ds=sidebyside Fix merge error hiding mmap ioengine under Windows build Signed-off-by: Jens Axboe --- 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",