From: Martin Kletzander <mkletzan@redhat.com>
Date: Sat, 15 Aug 2015 14:44:38 +0000 (+0200)
Subject: protocol: Don't use rename as a variable name
X-Git-Tag: v1.2.19-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4c8b67024776a3fbc4b77d98beb6cbf5b9cb726;p=thirdparty%2Flibvirt.git

protocol: Don't use rename as a variable name

That causes shadowing errors on older compilers.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 770aa72dc0..92a92e2bfa 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -3237,7 +3237,7 @@ struct remote_domain_rename_args {
 };
 
 struct remote_domain_rename_ret {
-    int rename;
+    int retcode;
 };
 
 /*----- Protocol. -----*/
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index ca36dc96e6..ff99c00969 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2690,7 +2690,7 @@ struct remote_domain_rename_args {
         u_int                      flags;
 };
 struct remote_domain_rename_ret {
-        int                        rename;
+        int                        retcode;
 };
 enum remote_procedure {
         REMOTE_PROC_CONNECT_OPEN = 1,