* Fix definition of FUSE_OPT_ENT for C++. Reported by Tim

Bruylants

diff --git a/ChangeLog b/ChangeLog
index c4a949b1bfa49c0f7937acbac44c7c688541eddf..07df9bd3bad30d0a1a8a81cd937865d8f482f04f 100644 (file)
--- 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 5595b4a44f627dc972149f5f335b4c069106869b..8c08d779acba2d592afef3c2a714aa501c297bb1 100644 (file)
--- 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