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.h | |
| 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.h')
| -rw-r--r-- | tools/libxc/xc_core.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h index 2a65bc2501..cf5b15d12b 100644 --- a/tools/libxc/xc_core.h +++ b/tools/libxc/xc_core.h @@ -39,7 +39,7 @@ #define XEN_DUMPCORE_ELFNOTE_NAME "Xen" /* note numbers are defined in xen/elfnote.h */ -struct xen_elfnote { +struct elfnote { uint32_t namesz; /* Elf_Note note; */ uint32_t descsz; uint32_t type; @@ -88,22 +88,22 @@ struct xen_dumpcore_elfnote_format_version_desc { struct xen_dumpcore_elfnote_none { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_none_desc none; }; struct xen_dumpcore_elfnote_header { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_header_desc header; }; struct xen_dumpcore_elfnote_xen_version { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_xen_version_desc xen_version; }; struct xen_dumpcore_elfnote_format_version { - struct xen_elfnote elfnote; + struct elfnote elfnote; struct xen_dumpcore_elfnote_format_version_desc format_version; }; |