From: handa <handa>
Date: Tue, 4 Dec 2007 11:32:41 +0000 (+0000)
Subject: Handle the case of _M17N_FLT_H_ being defined.
X-Git-Tag: REL-1-5-0~20
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08e7cd818a87fafc460cc35dc3e62524def3fc94;p=m17n%2Fm17n-lib.git

Handle the case of _M17N_FLT_H_ being defined.
---

diff --git a/src/m17n.h b/src/m17n.h
index 4a117cd..cdec4fe 100644
--- a/src/m17n.h
+++ b/src/m17n.h
@@ -37,7 +37,11 @@ M17N_BEGIN_HEADER
 extern void m17n_init (void);
 #undef M17N_INIT
 #ifdef _M17N_FLT_H_
-#define M17N_INIT() m17n_init_flt (1)
+#define M17N_INIT()	\
+  do {			\
+    m17n_init ();	\
+    m17n_init_flt ();	\
+  } while (0)
 #else  /* not _M17N_FLT_H_ */
 #define M17N_INIT() m17n_init ()
 #endif	/* not _M17N_FLT_H_ */
@@ -45,7 +49,11 @@ extern void m17n_init (void);
 extern void m17n_fini (void);
 #undef M17N_FINI
 #ifdef _M17N_FLT_H_
-#define M17N_FINI() m17n_fini_flt (1)
+#define M17N_FINI()	\
+  do {			\
+    m17n_fini_flt ();	\
+    m17n_fini ();	\
+  } while (0)
 #else  /* not _M17N_FLT_H_ */
 #define M17N_FINI() m17n_fini ()
 #endif	/* not _M17N_FLT_H_ */