RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUILD: tools: properly guard __GLIBC__ with defined() 

The test on the glibc versions based on #if (__GLIBC > 2 ...) fails to
build under -Wundef, let's prepend defined(__GLIBC__) first.
This commit is contained in:
Willy Tarreau 2021-08-30 10:15:35 +02:00
parent b131049eb5
commit 7b2108cad1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools.c
View File

@ -43,7 +43,7 @@ extern void *__elf_aux_vector;
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
#include <sys/auxv.h> #include <sys/auxv.h>
#endif #endif
@ -4768,7 +4768,7 @@ const char *get_exec_path()
{ {
const char *ret = NULL; const char *ret = NULL;
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16)) #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
long execfn = getauxval(AT_EXECFN); long execfn = getauxval(AT_EXECFN);
if (execfn && execfn != ENOENT) if (execfn && execfn != ENOENT)
@ -4800,7 +4800,7 @@ const char *get_exec_path()
static int dladdr_and_size(const void *addr, Dl_info *dli, size_t *size) static int dladdr_and_size(const void *addr, Dl_info *dli, size_t *size)
{ {
int ret; int ret;
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) // most detailed one #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) // most detailed one
const ElfW(Sym) *sym; const ElfW(Sym) *sym;
ret = dladdr1(addr, dli, (void **)&sym, RTLD_DL_SYMENT); ret = dladdr1(addr, dli, (void **)&sym, RTLD_DL_SYMENT);