summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-11-01 16:19:33 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-11-01 16:19:33 +0000
commit627e4b13e98aa6c1007c17b6ec3dcfef50ad81a2 (patch)
tree59cfb03ea3aed5aaa989a2b33f79fbbc9d105a14 /src
parent822ddd064c266345ab4fe19c4b574a4cd29d7159 (diff)
Remove support for --disable-debug
Diffstat (limited to 'src')
-rw-r--r--src/debug.c4
-rw-r--r--src/debug.h21
-rw-r--r--src/salut.c2
3 files changed, 0 insertions, 27 deletions
diff --git a/src/debug.c b/src/debug.c
index 365cb7d8..2315cc52 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -13,8 +13,6 @@
#include <telepathy-glib/telepathy-glib.h>
-#ifdef ENABLE_DEBUG
-
static DebugFlags flags = 0;
GDebugKey keys[] = {
@@ -138,5 +136,3 @@ void debug (DebugFlags flag,
g_free (message);
}
-
-#endif /* ENABLE_DEBUG */
diff --git a/src/debug.h b/src/debug.h
index 9e97ed3d..f3e80d3b 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -8,8 +8,6 @@
#include <wocky/wocky.h>
-#ifdef ENABLE_DEBUG
-
typedef enum
{
DEBUG_PRESENCE = 1 << 0,
@@ -52,25 +50,6 @@ void debug_free (void);
#endif /* DEBUG_FLAG */
-#else /* ENABLE_DEBUG */
-
-#ifdef DEBUG_FLAG
-
-static inline void
-DEBUG (
- const gchar *format,
- ...)
-{
-}
-
-#define DEBUGGING 0
-
-#endif /* DEBUG_FLAG */
-
-#define debug_free() G_STMT_START { } G_STMT_END
-
-#endif /* ENABLE_DEBUG */
-
G_END_DECLS
#endif
diff --git a/src/salut.c b/src/salut.c
index f61c29fe..17d85370 100644
--- a/src/salut.c
+++ b/src/salut.c
@@ -59,13 +59,11 @@ main (int argc, char **argv)
fatal_mask |= G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
-#ifdef ENABLE_DEBUG
tp_debug_divert_messages (g_getenv ("SALUT_LOGFILE"));
debug_set_flags_from_env ();
if (g_getenv ("SALUT_PERSIST"))
tp_debug_set_persistent (TRUE);
-#endif
loader = salut_plugin_loader_dup ();