Mutable is a keyword in C++11

This fix allows including OSTree on C++ projects.

diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index daa864046108e038683b08289d130bf54eb78de8..3aeee1b1b06f54d817f7a8d35051f91e4cb9f72b 100644 (file)
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -1960,7 +1960,7 @@ ostree_sysroot_deployment_set_kargs (OstreeSysroot     *self,
  * ostree_sysroot_deployment_set_mutable:
  * @self: Sysroot
  * @deployment: A deployment
- * @mutable: Whether or not deployment's files can be changed
+ * @is_mutable: Whether or not deployment's files can be changed
  * @error: Error
  *
  * By default, deployment directories are not mutable.  This function
@@ -1970,7 +1970,7 @@ ostree_sysroot_deployment_set_kargs (OstreeSysroot     *self,
 gboolean
 ostree_sysroot_deployment_set_mutable (OstreeSysroot     *self,
                                        OstreeDeployment  *deployment,
-                                       gboolean           mutable,
+                                       gboolean           is_mutable,
                                        GCancellable      *cancellable,
                                        GError           **error)
 {
@@ -1984,7 +1984,7 @@ ostree_sysroot_deployment_set_mutable (OstreeSysroot     *self,
   if (!glnx_opendirat (self->sysroot_fd, deployment_path, TRUE, &fd, error))
     goto out;
 
-  if (!_ostree_linuxfs_fd_alter_immutable_flag (fd, !mutable, cancellable, error))
+  if (!_ostree_linuxfs_fd_alter_immutable_flag (fd, !is_mutable, cancellable, error))
     goto out;
 
   ret = TRUE;

diff --git a/src/libostree/ostree-sysroot.h b/src/libostree/ostree-sysroot.h
index 88cb759280e8862e77a20052f797c501d21ccd98..bd3ecea1ae76a2d15c11baf75d94a3a0f1209f0e 100644 (file)
--- a/src/libostree/ostree-sysroot.h
+++ b/src/libostree/ostree-sysroot.h
@@ -119,7 +119,7 @@ gboolean ostree_sysroot_deploy_tree (OstreeSysroot     *self,
 
 gboolean ostree_sysroot_deployment_set_mutable (OstreeSysroot     *self,
                                                 OstreeDeployment  *deployment,
-                                                gboolean           mutable,
+                                                gboolean           is_mutable,
                                                 GCancellable      *cancellable,
                                                 GError           **error);