From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 7 Mar 2013 16:32:27 +0000 (+0000)
Subject: Rename 'clone' to 'clonevol' to avoid name clash with clone() syscall
X-Git-Tag: v1.0.4-rc1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74c47d091fa3d1eda7ece12fdf6091533f750961;p=thirdparty%2Flibvirt.git

Rename 'clone' to 'clonevol' to avoid name clash with clone() syscall

On RHEL-4 vintage one of the header files is polluted causing a
clash between the clone() syscall and the 'clone' parameter in
a libvirt driver API

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/driver.h b/src/driver.h
index f60bf93721..28b4a97949 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -1443,7 +1443,7 @@ typedef char *
 typedef virStorageVolPtr
     (*virDrvStorageVolCreateXMLFrom)         (virStoragePoolPtr pool,
                                               const char *xmldesc,
-                                              virStorageVolPtr clone,
+                                              virStorageVolPtr clonevol,
                                               unsigned int flags);
 typedef int
     (*virDrvStorageVolDownload) (virStorageVolPtr vol,