From: Tim Duesterhus <tim@bastelstu.be>
Date: Tue, 26 Jan 2021 18:24:24 +0000 (+0100)
Subject: BUILD: Include stdlib.h in compiler.h if DEBUG_USE_ABORT is set
X-Git-Tag: v2.4-dev7~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=491be54cf1ffc7db97858912e466866244129496;p=thirdparty%2Fhaproxy.git

BUILD: Include stdlib.h in compiler.h if DEBUG_USE_ABORT is set

Building with `"DEBUG=-DDEBUG_STRICT=1 -DDEBUG_USE_ABORT=1"` previously emitted the warning:

    In file included from include/haproxy/api.h:35:0,
                     from src/mux_pt.c:13:
    include/haproxy/buf.h: In function ‘br_init’:
    include/haproxy/bug.h:42:90: warning: implicit declaration of function ‘abort’ [-Wimplicit-function-declaration]
     #define ABORT_NOW() do { extern void ha_backtrace_to_stderr(); ha_backtrace_to_stderr(); abort(); } while (0)
                                                                                              ^
    include/haproxy/bug.h:56:21: note: in expansion of macro ‘ABORT_NOW’
     #define CRASH_NOW() ABORT_NOW()
                         ^
    include/haproxy/bug.h:68:4: note: in expansion of macro ‘CRASH_NOW’
        CRASH_NOW();                                           \
        ^
    include/haproxy/bug.h:62:35: note: in expansion of macro ‘__BUG_ON’
     #define _BUG_ON(cond, file, line) __BUG_ON(cond, file, line)
                                       ^
    include/haproxy/bug.h:61:22: note: in expansion of macro ‘_BUG_ON’
     #define BUG_ON(cond) _BUG_ON(cond, __FILE__, __LINE__)
                          ^
    include/haproxy/buf.h:875:2: note: in expansion of macro ‘BUG_ON’
      BUG_ON(size < 2);
      ^

This patch fixes that issue. The `DEBUG_USE_ABORT` option exists for use with
static analysis tools. No backport needed.
---

diff --git a/include/haproxy/compiler.h b/include/haproxy/compiler.h
index fba6dc3580..87012d27c2 100644
--- a/include/haproxy/compiler.h
+++ b/include/haproxy/compiler.h
@@ -22,6 +22,9 @@
 #ifndef _HAPROXY_COMPILER_H
 #define _HAPROXY_COMPILER_H
 
+#ifdef DEBUG_USE_ABORT
+#include <stdlib.h>
+#endif
 
 /*
  * Gcc before 3.0 needs [0] to declare a variable-size array