From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 26 Jul 2011 15:03:20 +0000 (+0100)
Subject: _dbus_verbose_real: tidy conditional prototype to not break nesting
X-Git-Tag: dbus-1.5.10~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e0f4b52bf4e80babc19f2d28fca4aaa92917371;p=thirdparty%2Fdbus.git

_dbus_verbose_real: tidy conditional prototype to not break nesting

The mismatched opening parenthesis caused vim syntax highlighting to
consider every subsequent brace in the file to be an error, which was
pretty annoying.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46095
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
---

diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index 472e49c79..a5db14604 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -390,14 +390,13 @@ _dbus_is_verbose_real (void)
  * @param format printf-style format string.
  */
 void
+_dbus_verbose_real (
 #ifdef DBUS_CPP_SUPPORTS_VARIABLE_MACRO_ARGUMENTS
-_dbus_verbose_real (const char *file, 
+                    const char *file,
                     const int line, 
                     const char *function, 
-                    const char *format,
-#else
-_dbus_verbose_real (const char *format,
 #endif
+                    const char *format,
                     ...)
 {
   va_list args;