--- include/asterisk/logger.h	(Asterisk 18.6.0)
+++ include/asterisk/logger.h	(working copy)
@@ -741,17 +741 @@
-#define SCOPE_TRACE(level, ...) \
-	const char *__trace_funcname = __PRETTY_FUNCTION__; \
-	auto void __scopevar ## __LINE__ ## __EXIT(void * v); \
-	void __scopevar ## __LINE__ ## __EXIT(void * v __attribute__((unused))) { \
-		if (TRACE_ATLEAST(level)) { \
-			__ast_trace(__FILE__, __LINE__, __trace_funcname, AST_TRACE_INDENT_DEC_BEFORE, 0, " " __VA_ARGS__); \
-		} \
-	} \
-	void *__scopevar ## __LINE__ ## __TRACER __attribute__((cleanup(__scopevar ## __LINE__ ## __EXIT))) = (void *) __PRETTY_FUNCTION__ ; \
-	auto int __scopevar ## __LINE__ ## __ENTER(void); \
-	int __scopevar ## __LINE__ ## __ENTER(void) { \
-		if (TRACE_ATLEAST(level)) { \
-			__ast_trace(__FILE__, __LINE__, __trace_funcname, AST_TRACE_INDENT_INC_AFTER, 0, " " __VA_ARGS__); \
-		} \
-		return 0; \
-	} \
-	int __scopevar ## __LINE__ ## __RETURN __attribute__((unused)) = __scopevar ## __LINE__ ## __ENTER()
+#define SCOPE_TRACE(level, ...)