[PATCH] libelf: remove usage of sys/cdefs

[PATCH] libelf: remove usage of sys/cdefs

[Rosen Penev]

sys/cdefs is a deprecated glibc header that is unavailable with other
libc implementations such as musl.

features.h under glibc includes sys/cdefs whereas it does not under musl.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 lib/fixedsizehash.h |  1 -
 libelf/elf.h        | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
index dac2a5f5..43016fc3 100644
--- a/lib/fixedsizehash.h
+++ b/lib/fixedsizehash.h
@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/cdefs.h>
 
 #include <system.h>
 
diff --git a/libelf/elf.h b/libelf/elf.h
index 01648bdb..d36fb806 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -19,9 +19,9 @@
 #ifndef _ELF_H
 #define	_ELF_H 1
 
-#include <features.h>
-
-__BEGIN_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Standard ELF types.  */
 
@@ -4007,6 +4007,8 @@ enum
 #define R_NDS32_TLS_TPOFF	102
 #define R_NDS32_TLS_DESC	119
 
-__END_DECLS
+#ifdef __cplusplus
+}
+#endif
 
 #endif	/* elf.h */
-- 
2.25.1

Re: [PATCH] libelf: remove usage of sys/cdefs

[Mark Wielaard]

Hi,

Thanks for the patch, but elf.h comes from glibc.  So please get your
fix accepted upstream (sent it to libc-alpha@sourceware.org) and we'll
pick it up next time we sync with the glibc code.

Thanks,

Mark

Re: [PATCH] libelf: remove usage of sys/cdefs

[Rosen Penev]

On Sun, Apr 5, 2020 at 4:39 PM Mark Wielaard <mark@klomp.org> wrote:
>
> Hi,
>
> Thanks for the patch, but elf.h comes from glibc.  So please get your
> fix accepted upstream (sent it to libc-alpha@sourceware.org) and we'll
> pick it up next time we sync with the glibc code.
Hrm OK.
>
> Thanks,
>
> Mark