Fixes for g++ (4.7.2) following compiler errors when fio.h
gets included (e.g. in an external C++ ioengine):
--8<---
[...]
parse.h:31:6: error: expected unqualified-id before ‘or’ token
[...]
--->8---
Signed-off-by: Daniel Gollub <d.gollub@xxxxxxxxxx>
---
options.c | 6 +++---
parse.c | 4 ++--
parse.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/options.c b/options.c
index 57e9af5..a646546 100644
--- a/options.c
+++ b/options.c
@@ -1901,18 +1901,18 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
{ .ival = "wait_before",
.oval = SYNC_FILE_RANGE_WAIT_BEFORE,
.help = "SYNC_FILE_RANGE_WAIT_BEFORE",
- .or = 1,
+ .orval = 1,
},
{ .ival = "write",
.oval = SYNC_FILE_RANGE_WRITE,
.help = "SYNC_FILE_RANGE_WRITE",
- .or = 1,
+ .orval = 1,
},
{
.ival = "wait_after",
.oval = SYNC_FILE_RANGE_WAIT_AFTER,
.help = "SYNC_FILE_RANGE_WAIT_AFTER",
- .or = 1,
+ .orval = 1,
},
},
.type = FIO_OPT_STR_MULTI,
diff --git a/parse.c b/parse.c
index 6141c91..f74f0a9 100644
--- a/parse.c
+++ b/parse.c
@@ -415,14 +415,14 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data,
if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
ret = 0;
if (o->roff1) {
- if (vp->or)
+ if (vp->orval)
*(unsigned int *) o->roff1 |= vp->oval;
else
*(unsigned int *) o->roff1 = vp->oval;
} else {
if (!o->off1)
continue;
- val_store(ilp, vp->oval, o->off1, vp->or, data);
+ val_store(ilp, vp->oval, o->off1, vp->orval, data);
}
continue;
}
diff --git a/parse.h b/parse.h
index 34d99d4..b98b514 100644
--- a/parse.h
+++ b/parse.h
@@ -28,7 +28,7 @@ struct value_pair {
const char *ival; /* string option */
unsigned int oval; /* output value */
const char *help; /* help text for sub option */
- int or; /* OR value */
+ int orval; /* OR value */
void *cb; /* sub-option callback */
};
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
