Move demangling-related code from common.h to demangle.h

Adjust users accordingly.

common.h

@@ -39,13 +39,6 @@
 #include "proc.h"
 #include "forward.h"
 
-#if defined HAVE_LIBSUPC__ || defined HAVE_LIBSTDC__
-# define USE_CXA_DEMANGLE
-#endif
-#if defined HAVE_LIBIBERTY || defined USE_CXA_DEMANGLE
-# define USE_DEMANGLE
-#endif
-
 extern char * command;
 
 extern int exiting;  /* =1 if we have to exit ASAP */
@@ -69,9 +62,6 @@ struct opt_c_struct {
 
 #include "options.h"
 #include "output.h"
-#ifdef USE_DEMANGLE
-#include "demangle.h"
-#endif
 
 extern struct dict *dict_opt_c;
 

demangle.c

@@ -26,7 +26,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "common.h"
+#include "demangle.h"
+#include "dict.h"
+#include "debug.h"
 
 #ifdef USE_DEMANGLE
 

demangle.h

@@ -1,5 +1,6 @@
 /*
  * This file is part of ltrace.
+ * Copyright (C) 2012 Petr Machata, Red Hat Inc.
  * Copyright (C) 2006 Ian Wienand
  *
  * This program is free software; you can redistribute it and/or
@@ -20,6 +21,13 @@
 
 #include "config.h"
 
+#if defined HAVE_LIBSUPC__ || defined HAVE_LIBSTDC__
+# define USE_CXA_DEMANGLE
+#endif
+#if defined HAVE_LIBIBERTY || defined USE_CXA_DEMANGLE
+# define USE_DEMANGLE
+#endif
+
 extern char *cplus_demangle(const char *mangled, int options);
 
 const char *my_demangle(const char *function_name);

options.c

@@ -39,6 +39,7 @@
 #include "common.h"
 #include "filter.h"
 #include "glob.h"
+#include "demangle.h"
 
 #ifndef SYSCONFDIR
 #define SYSCONFDIR "/etc"

output.c

@@ -36,6 +36,7 @@
 
 #include "common.h"
 #include "proc.h"
+#include "demangle.h"
 #include "library.h"
 #include "type.h"
 #include "value.h"