From 337d1d1bab969b812081c0f7744968b8c9a2f687 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 27 Apr 2004 11:52:37 +0000 Subject: [PATCH] Made C++ safe. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7328 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/elf_priv.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/headers/private/kernel/elf_priv.h b/headers/private/kernel/elf_priv.h index b4eff6453d..d88ccdcb1b 100644 --- a/headers/private/kernel/elf_priv.h +++ b/headers/private/kernel/elf_priv.h @@ -10,12 +10,12 @@ #include -struct elf_region { +typedef struct elf_region { area_id id; addr_t start; addr_t size; long delta; -}; +} elf_region; struct elf_image_info { struct elf_image_info *next; @@ -23,7 +23,7 @@ struct elf_image_info { image_id id; int32 ref_count; void *vnode; - struct elf_region regions[2]; // describes the text and data regions + elf_region regions[2]; // describes the text and data regions addr_t dynamic_ptr; // pointer to the dynamic section struct elf_linked_image *linked_images; @@ -51,7 +51,11 @@ struct elf_image_info { #define HASHBUCKETS(image) ((unsigned int *)&(image)->symhash[2]) #define HASHCHAINS(image) ((unsigned int *)&(image)->symhash[2+HASHTABSIZE(image)]) -extern int elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *sym, - struct elf_image_info *shared_image, const char *sym_prepend, addr_t *sym_addr); +extern +#ifdef __cplusplus +"C" +#endif +status_t elf_resolve_symbol(struct elf_image_info *image, struct Elf32_Sym *sym, + struct elf_image_info *shared_image, const char *sym_prepend, addr_t *sym_addr); #endif /* _KERNEL_ELF_PRIV_H */