From e02ed691ca60a2f537dd60910649e9b78100e924 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sat, 15 Nov 2008 02:42:56 +0000 Subject: [PATCH] Patch by Adrian Panasiuk: fix broken TRACE macro definitions (ticket #3133). Thanks! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28656 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../input_server/devices/keyboard/KeyboardInputDevice.cpp | 4 ++-- src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp index 749fdc7912..1027411142 100644 --- a/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp +++ b/src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp @@ -67,10 +67,10 @@ __FUNCTION__, sFunctionDepth) # define KID_CALLED(x...) FunctionTracer _ft(this, "KeyboardInputDevice", \ __FUNCTION__, sFunctionDepth) -# define TRACE(x...) { BString _to; \ +# define TRACE(x...) do { BString _to; \ _to.Append(' ', (sFunctionDepth + 1) * 2); \ debug_printf("%p -> %s", this, _to.String()); \ - debug_printf(x); } + debug_printf(x); } while (0) # define LOG_EVENT(text...) do {} while (0) # define LOG_ERR(text...) TRACE(text) #else diff --git a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp index acda0b9173..d40fc7358f 100644 --- a/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp +++ b/src/add-ons/input_server/devices/mouse/MouseInputDevice.cpp @@ -76,10 +76,10 @@ __FUNCTION__, sFunctionDepth) # define MID_CALLED(x...) FunctionTracer _ft(this, "MouseInputDevice", \ __FUNCTION__, sFunctionDepth) -# define TRACE(x...) { BString _to; \ +# define TRACE(x...) do { BString _to; \ _to.Append(' ', (sFunctionDepth + 1) * 2); \ debug_printf("%p -> %s", this, _to.String()); \ - debug_printf(x); } + debug_printf(x); } while (0) # define LOG_EVENT(text...) do {} while (0) # define LOG_ERR(text...) TRACE(text) #else