From 55a6c4f34de59cc3d5d5079968e382c6fc303ef9 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Tue, 3 Mar 2020 17:06:52 +0100
Subject: [PATCH] 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.
---
 src/standard.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/standard.c b/src/standard.c
index 289184765..02c1af6b7 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