projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix merge error hiding mmap ioengine under Windows build
[fio.git]
/
options.c
diff --git
a/options.c
b/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",