Re: [PATCH] Don't use __BEGIN_DECLS macros from glibc.

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

Hi Érico,

On Mon, 2020-10-26 at 23:24 +0100, Mark Wielaard wrote:
> Please just suggest a patch upstream to libc-alpha@sourceware.org.
> We'll pick it up when they decide to accept it. Note that it is also a
> public glibc header installed as /usr/include/elf.h.

I saw your patch was accepted upstream, so I synced it and pushed the
attached.

Thanks,

Mark

[-- Attachment #2: 0001-libelf-Sync-elf.h-from-glibc.patch --]
[-- Type: text/x-patch, Size: 1118 bytes --]

From 56f64c94651f4840e890c1963f9d6f6a4123abde Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 28 Oct 2020 12:36:57 +0100
Subject: [PATCH] libelf: Sync elf.h from glibc.

Makes elf.h standalone and removes __BEGIN_DECLS/__END_DECLS macros.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 libelf/ChangeLog | 4 ++++
 libelf/elf.h     | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index a3f15883..b15508f2 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2020-10-28  Mark Wielaard  <mark@klomp.org>
+
+	* elf.h: Update from glibc.
+
 2020-08-28  Mark Wielaard  <mark@klomp.org>
 
 	* elf.h: Update from glibc.
diff --git a/libelf/elf.h b/libelf/elf.h
index ff9f1dad..6439c1a4 100644
--- a/libelf/elf.h
+++ b/libelf/elf.h
@@ -19,10 +19,6 @@
 #ifndef _ELF_H
 #define	_ELF_H 1
 
-#include <features.h>
-
-__BEGIN_DECLS
-
 /* Standard ELF types.  */
 
 #include <stdint.h>
@@ -4105,6 +4101,4 @@ enum
 #define R_ARC_TLS_LE_S9		0x4a
 #define R_ARC_TLS_LE_32		0x4b
 
-__END_DECLS
-
 #endif	/* elf.h */
-- 
2.18.4