generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-10-15 23:20:10 +02:00
Code Issues Projects Releases Wiki Activity

include: Simplify glibc version dependent macro handling

Browse Source 
We test once whether __GLIBC__ is not defined, so we do not need to test
whether it is on the OR branch afterwards. We decouple the glibc version
restriction check from the _*_SOURCE variable, as that contains an
implicit opposite version check.
This commit is contained in:
Guillem Jover
2022-10-05 02:05:46 +02:00
parent 28298ac037
commit 2f9eddc277
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/bsd/stdlib.h
View File

@@ -72,7 +72,8 @@ int sradixsort(const unsigned char **base, int nmemb,
void *reallocf(void *ptr, size_t size); void *reallocf(void *ptr, size_t size);
#if !defined(__GLIBC__) || \ #if !defined(__GLIBC__) || \
(defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) !__GLIBC_PREREQ(2, 26) || \
!defined(_GNU_SOURCE)
void *reallocarray(void *ptr, size_t nmemb, size_t size); void *reallocarray(void *ptr, size_t nmemb, size_t size);
#endif #endif
void *recallocarray(void *ptr, size_t oldnmemb, size_t nmemb, size_t size); void *recallocarray(void *ptr, size_t oldnmemb, size_t nmemb, size_t size);

3
include/bsd/string.h
View File

@@ -47,7 +47,8 @@ char *strnstr(const char *str, const char *find, size_t str_len);
void strmode(mode_t mode, char *str); void strmode(mode_t mode, char *str);
#if !defined(__GLIBC__) || \ #if !defined(__GLIBC__) || \
(defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) !__GLIBC_PREREQ(2, 25) || \
!defined(_GNU_SOURCE)
void explicit_bzero(void *buf, size_t len); void explicit_bzero(void *buf, size_t len);
#endif #endif
__END_DECLS __END_DECLS