summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Szeredi <miklos@szeredi.hu>2010-02-18 14:07:09 +0000
committerMiklos Szeredi <miklos@szeredi.hu>2010-02-18 14:07:09 +0000
commitb21279ff36bf09f787ee143196a2b77d8bada469 (patch)
treeb3c51f9460c1be221e43358a64321d839b1c9e85
parentbba1ff4cf64a095d9b6c193e8a5d19da3f6e1a16 (diff)
downloadfuse-b21279ff36bf09f787ee143196a2b77d8bada469.tar.gz
* Fix definition of FUSE_OPT_ENT for C++. Reported by Tim
Bruylants
-rw-r--r--ChangeLog5
-rw-r--r--include/fuse_opt.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4a949b..07df9bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-18 Miklos Szeredi <miklos@szeredi.hu>
+
+ * Fix definition of FUSE_OPT_ENT for C++. Reported by Tim
+ Bruylants
+
2010-02-03 Miklos Szeredi <miklos@szeredi.hu>
* Fix stack alignment for clone()
diff --git a/include/fuse_opt.h b/include/fuse_opt.h
index 5595b4a..8c08d77 100644
--- a/include/fuse_opt.h
+++ b/include/fuse_opt.h
@@ -100,7 +100,7 @@ struct fuse_opt {
* Last option. An array of 'struct fuse_opt' must end with a NULL
* template value
*/
-#define FUSE_OPT_END { .templ = NULL }
+#define FUSE_OPT_END { NULL, 0, 0 }
/**
* Argument list