Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++
Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: include/dbus-c++/connection.h include/dbus-c++/dispatcher.h include/dbus-c++/pendingcall.h src/dispatcher.cpp
This commit is contained in:
commit
c1970e2352
57 changed files with 1642 additions and 1638 deletions
|
|
@ -32,13 +32,13 @@
|
|||
#include <cstdio>
|
||||
#include <stdlib.h>
|
||||
|
||||
static void _debug_log_default(const char* format, ...)
|
||||
static void _debug_log_default(const char *format, ...)
|
||||
{
|
||||
#ifdef DEBUG
|
||||
|
||||
static int debug_env = getenv("DBUSXX_VERBOSE") ? 1 : 0;
|
||||
|
||||
if(debug_env)
|
||||
if (debug_env)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, format);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue