diff options
| author | Richard Jones <rjones@redhat.com> | 2010-08-25 11:41:17 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-08-25 11:41:17 +0100 |
| commit | 27ef6f9171127afd248f38d280cf3d0eae51fdaf (patch) | |
| tree | dd28105a0aa44e06b1b36ac578d76f52d1ec61bb /fish | |
| parent | 6d15d4e7c27477507ba355384a340ce86cec617b (diff) | |
| download | libguestfs-27ef6f9171127afd248f38d280cf3d0eae51fdaf.tar.gz libguestfs-27ef6f9171127afd248f38d280cf3d0eae51fdaf.tar.xz libguestfs-27ef6f9171127afd248f38d280cf3d0eae51fdaf.zip | |
Rename global 'xdr_str'.
Two bits of XDR both contained a definition called 'str' which
means that 'xdr_str' was being exported globally twice. Because
of the linker script this didn't affect us. But it's best to
rename this global so that conflicts cannot arise.
Diffstat (limited to 'fish')
| -rw-r--r-- | fish/rc_protocol.x | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fish/rc_protocol.x b/fish/rc_protocol.x index 9d8f0e9f..fa99a5e9 100644 --- a/fish/rc_protocol.x +++ b/fish/rc_protocol.x @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -typedef string str<>; +typedef string guestfish_str<>; struct guestfish_hello { /* Client and server version strings must match exactly. We change @@ -27,7 +27,7 @@ struct guestfish_hello { struct guestfish_call { string cmd<>; - str args<>; + guestfish_str args<>; bool exit_on_error; }; |