From: Saleem Abdulrasool <abdulras@google.com>
Date: Fri, 20 Aug 2021 18:20:08 +0000 (+0000)
Subject: lib: remove usage of `sys/cdefs.h`
X-Git-Tag: elfutils-0.186~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d390548df1942e98a1d836269a5e41ba52e121f1;p=thirdparty%2Felfutils.git

lib: remove usage of `sys/cdefs.h`

This header is a BSD header that is also available in glibc.  However,
this is a not a standard C header and was used for `__CONCAT`.  Because
this is not a standard header, not all libc implementations provide the
header.  Remove the usage of the header and always use the previously
fallback path.  This is needed in order to build with musl.

Signed-off-by: Saleem Abdulrasool <abdulras@google.com>
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 44366fec9..a95f80417 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2021-08-20  Saleem Abdulrasool  <abdulras@google.com>
+
+	* fixedsizehash.h: Remove sys/cdefs.h include. Unconditionally
+	define STROF and CONCAT macros.
+
 2021-07-28  Mark Wielaard  <mark@klomp.org>
 
 	* system.h (reallocarray): New static inline fallback function.
diff --git a/lib/fixedsizehash.h b/lib/fixedsizehash.h
index dac2a5f55..f333ad994 100644
--- a/lib/fixedsizehash.h
+++ b/lib/fixedsizehash.h
@@ -30,17 +30,12 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/cdefs.h>
 
 #include <system.h>
 
-#ifdef __CONCAT
-#define CONCAT(t1,t2) __CONCAT (t1,t2)
-#else
 #define STROF(t2) t2
 #define CONCAT_EXPANDED(t1,t2) t1 ## t2
 #define CONCAT(t1,t2) CONCAT_EXPANDED(t1,t2)
-#endif
 
 /* Before including this file the following macros must be defined: