Fix merge error hiding mmap ioengine under Windows build

[fio.git] / options.c

diff --git a/options.c b/options.c
index 37e68d264d928bebdf7ae6b804f14b15549da3cb..67d0d2ddb2ad22b8bd5789c9691fb1334476e195 100644 (file)
--- a/options.c
+++ b/options.c
@@ -675,6 +675,11 @@ static int str_verify_pattern_cb(void *data, const char *input)
                }
        }
        td->o.verify_pattern_bytes = i;
+       /*
+        * VERIFY_META could already be set
+        */
+       if (td->o.verify == VERIFY_NONE)
+               td->o.verify = VERIFY_PATTERN;
        return 0;
 }
 
@@ -941,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",