diff options
| author | Saleem Abdulrasool <abdulras@google.com> | 2021-08-20 18:20:08 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2021-08-27 17:05:44 +0200 |
| commit | d390548df1942e98a1d836269a5e41ba52e121f1 (patch) | |
| tree | fbd944c1f7e7df310e5d3a180950a714c7bc7c1b | |
| parent | dc6ddd8ba061c0486a2c4b5a17ddd086d5e3a32d (diff) | |
| download | elfutils-d390548df1942e98a1d836269a5e41ba52e121f1.tar.gz | |
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>
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/fixedsizehash.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index 44366fec..a95f8041 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 dac2a5f5..f333ad99 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: |