From: Érico Rolim <ericonr@disroot.org>
Date: Tue, 27 Oct 2020 14:17:41 +0000 (-0300)
Subject: Make elf.h header self contained.
X-Git-Tag: glibc-2.33~346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9538f6b95a3be228edc078ce58258f0574142e0c;p=thirdparty%2Fglibc.git

Make elf.h header self contained.

The elf/elf.h header is shared, verbatim, by the elfutils project.
However, elfutils can be used on systems with libcs other than glibc,
making the presence of __BEGIN_DECLS, __END_DECLS and <features.h> in
the file something that downstream distros may have to add patches for.

Furthermore, this file doesn't declare anything with language linkage,
so `extern "C" {}` blocks aren't necessary; it also doesn't have any
conditional definitions based on feature test macros, making inclusion
of features.h unnecessary.
---

diff --git a/elf/elf.h b/elf/elf.h
index ff9f1dadd51..6439c1a4d55 100644
--- a/elf/elf.h
+++ b/elf/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 */