Fix merge error hiding mmap ioengine under Windows build
authorJens Axboe <jaxboe@fusionio.com>
Wed, 19 Jan 2011 18:07:28 +0000 (11:07 -0700)
committerJens Axboe <jaxboe@fusionio.com>
Wed, 19 Jan 2011 18:07:28 +0000 (11:07 -0700)
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
options.c

index 163e50899e4122d322f4a293b496b95b67d11811..67d0d2ddb2ad22b8bd5789c9691fb1334476e195 100644 (file)
--- 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",
 #endif
 #ifdef FIO_HAVE_WINDOWSAIO
                          { .ival = "windowsaio",
-                               .help = "Windows native asynchronous IO"
+                           .help = "Windows native asynchronous IO"
                          },
                          },
+#endif
                          { .ival = "mmap",
                            .help = "Memory mapped IO"
                          },
                          { .ival = "mmap",
                            .help = "Memory mapped IO"
                          },
-#endif
 #ifdef FIO_HAVE_SPLICE
                          { .ival = "splice",
                            .help = "splice/vmsplice based IO",
 #ifdef FIO_HAVE_SPLICE
                          { .ival = "splice",
                            .help = "splice/vmsplice based IO",