projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
034ca7e
)
Fix merge error hiding mmap ioengine under Windows build
author
Jens Axboe
<jaxboe@fusionio.com>
Wed, 19 Jan 2011 18:07:28 +0000
(11:07 -0700)
committer
Jens 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
patch
|
blob
|
blame
|
history
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",
-
.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",