From 5f772ef95e51db46ed04c300acb05ddc59a13961 Mon Sep 17 00:00:00 2001
From: handa <handa>
Date: Mon, 9 Jul 2007 01:51:48 +0000
Subject: [PATCH] Include m17n-core.h if not yet done.  Use macros
 M17N_BEGIN_HEADER and M17N_END_HEADER.

---
 src/m17n-gui.h  |    9 ++-------
 src/m17n-misc.h |    9 +++++++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/m17n-gui.h b/src/m17n-gui.h
index d73b7e0..81ba902 100644
--- a/src/m17n-gui.h
+++ b/src/m17n-gui.h
@@ -27,10 +27,7 @@
 #include <m17n.h>
 #endif
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+M17N_BEGIN_HEADER
 
 #if !defined (FOR_DOXYGEN) || defined (DOXYGEN_INTERNAL_MODULE)
 
@@ -987,9 +984,7 @@ extern MFace *mdebug_dump_face (MFace *face, int indent);
 extern MFont *mdebug_dump_font (MFont *font);
 extern MFontset *mdebug_dump_fontset (MFontset *fontset, int indent);
 
-#ifdef __cplusplus
-}
-#endif
+M17N_END_HEADER
 
 #endif /* _M17N_GUI_H_ */
 
diff --git a/src/m17n-misc.h b/src/m17n-misc.h
index 39e6a9e..39ea41c 100644
--- a/src/m17n-misc.h
+++ b/src/m17n-misc.h
@@ -23,6 +23,12 @@
 #ifndef _M17N_ERR_H_
 #define _M17N_ERR_H_
 
+#ifndef _M17N_CORE_H_
+#include <m17n-core.h>
+#endif
+
+M17N_BEGIN_HEADER
+
 /*** @defgroup m17nMisc MISC API */
 /*=*/
 /*** @ingroup m17nMisc  */
@@ -115,6 +121,9 @@ extern MCharTable *mdebug_dump_chartab (MCharTable *table, int indent);
 /***en @defgroup m17nInternal Internal */
 /***ja @defgroup m17nInternal Internal */
 #endif
+
+M17N_END_HEADER
+
 #endif /* _M17N_ERR_H_ */
 
 /*
-- 
1.7.10.4