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.

(cherry picked from commit 55a6c4f34de59cc3d5d5079968e382c6fc303ef9)
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/src/standard.c b/src/standard.c
index 2adc6b2..5a641be 100644 (file)
--- a/src/standard.c
+++ b/src/standard.c
@@ -4361,14 +4361,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, ...)
-{
-}
-
 /* Random number generator state, see below */
 static uint64_t ha_random_state[2];