summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2011-10-25 11:35:39 +0200
committerMurray Cumming <murrayc@murrayc.com>2011-10-25 11:35:39 +0200
commitc53fafb304af78c34baef856e056519933d32432 (patch)
tree35e061bf3847745bb046cc40ebdea9fc57c6930b /tools
parent57942f6c2b1e15b7676d2fb24da71475be73a45f (diff)
downloadglibmm-c53fafb304af78c34baef856e056519933d32432.tar.gz
gmmproc: Include <glibmm.h> in .cc files for convenience.
* tools/m4/base.m4: Add an include <glibmm.h> line to the .cc files. * glib/src/optioncontext.ccg: Rename a namespace to avoid a clash. It is more useful to keep the general glibmm.h include out of headers.
Diffstat (limited to 'tools')
-rw-r--r--tools/m4/base.m42
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/m4/base.m4 b/tools/m4/base.m4
index 228bbf58..6594aa2a 100644
--- a/tools/m4/base.m4
+++ b/tools/m4/base.m4
@@ -315,6 +315,8 @@ _DEPRECATE_IFDEF_CLASS_START
#include <__MODULE__/private/__FILE__`'_p.h>
_IMPORT(SECTION_CC_INCLUDES)
+#include <glibmm.h>
+
_IMPORT(SECTION_SRC_CUSTOM)
namespace