From: Willy Tarreau <w@1wt.eu>
Date: Tue, 3 Mar 2020 16:06:52 +0000 (+0100)
Subject: BUILD: tools: remove obsolete and conflicting trace() from standard.c
X-Git-Tag: v2.2-dev4~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55a6c4f34de59cc3d5d5079968e382c6fc303ef9;p=thirdparty%2Fhaproxy.git

BUILD: tools: remove obsolete and conflicting trace() from standard.c

Since commit 4c2ae48375 ("MINOR: trace: implement a very basic trace()
function") merged in 2.1, trace() is an inline function. It must not
appear in standard.c anymore and may break build depending on includes.

This can be backported to 2.1.
---

diff --git a/src/standard.c b/src/standard.c
index 2891847652..02c1af6b7a 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -4360,14 +4360,6 @@ int varint_bytes(uint64_t v)
 	return len;
 }
 
-/* do nothing, just a placeholder for debugging calls, the real one is in trace.c */
-#ifndef USE_OBSOLETE_LINKER
-__attribute__((weak,format(printf, 1, 2)))
-#endif
-void trace(char *msg, ...)
-{
-}
-
 /*
  * Local variables:
  *  c-indent-level: 8