commit 277a36d319a639abe7b5b89b79d4c7e18f0172b6
author Willy Tarreau <w@1wt.eu> Mon Sep 13 09:32:01 2021 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Thu Sep 23 17:20:17 2021 +0200
tree 90f3433a796d1988ccf064e98baa48317c275fce
parent d894739c2e6b8e3457f74b67e89ad740c49d6ffc

BUILD: halog: fix a -Wundef warning on non-glibc systems

Dmitry reported this warning on FreeBSD since the introduction of -Wundef:

  admin/halog/fgets2.c:38:30: warning: '__GLIBC__' is not defined, evaluates to 0 [-Wundef]
  #if defined(__x86_64__) &&  (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 15))
                               ^
A defined() was missing.

(cherry picked from commit 80d3daad50144b22891bcfdd6356c57a21977ce1)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

admin/halog/fgets2.c

diff --git a/admin/halog/fgets2.c b/admin/halog/fgets2.c
index 3634f55..62f1070 100644
--- a/admin/halog/fgets2.c
+++ b/admin/halog/fgets2.c
@@ -35,7 +35,7 @@
 #endif
 
 /* memchr() is faster in glibc with SSE since commit 093ecf92998de2 */
-#if defined(__x86_64__) &&  (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 15))
+#if defined(__x86_64__) && defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 15))
 #define USE_MEMCHR
 #endif