diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-26 11:21:03 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-26 11:21:03 +0000 |
| commit | f7e153faad1237a5e08ae2aa58d704d990843861 (patch) | |
| tree | 5cd7bdeaa1b34989ac55decdbb03c772c428def2 /tools/libxc/xc_core.c | |
| parent | cf5a7b113fb1a10be495a090fef46e1eb8c71ed0 (diff) | |
| download | xen-f7e153faad1237a5e08ae2aa58d704d990843861.tar.gz xen-f7e153faad1237a5e08ae2aa58d704d990843861.tar.bz2 xen-f7e153faad1237a5e08ae2aa58d704d990843861.zip | |
Resolve conflict over use of name xen_elfnote.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'tools/libxc/xc_core.c')
| -rw-r--r-- | tools/libxc/xc_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 31c1532b69..5a23667667 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -328,7 +328,7 @@ xc_domain_dumpcore_via_callback(int xc_handle, Elf_Shdr *shdr; /* elf notes */ - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_none_desc none; struct xen_dumpcore_elfnote_header_desc header; struct xen_dumpcore_elfnote_xen_version_desc xen_version; |