X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-misc.h;h=2021dbadeebf564a01a85e9867f4cf3c62d014eb;hb=1b7bcea372680c0e52493e54e3b4c2e16744101d;hp=eb9566c34439a01ccf87bd09f577458a34971c1a;hpb=d15243e9c27b1b345fa655e2371ae5c0ad19d995;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-misc.h b/src/m17n-misc.h
index eb9566c..2021dba 100644
--- a/src/m17n-misc.h
+++ b/src/m17n-misc.h
@@ -1,5 +1,5 @@
 /* m17n-misc.h -- header file for the MISC API.
-   Copyright (C) 2003, 2004
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H15PRO112
 
@@ -17,13 +17,21 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the m17n library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    02111-1307, USA.  */
 
 #ifndef _M17N_ERR_H_
 #define _M17N_ERR_H_
 
+#ifndef _M17N_CORE_H_
+#include <m17n-core.h>
+#endif
+
+M17N_BEGIN_HEADER
+
 /*** @defgroup m17nMisc MISC API */
+/***en @brief Miscellaneous API */
+/***ja @brief ¤½¤Î¾¤Î API */
 /*=*/
 /*** @ingroup m17nMisc  */
 /***en @defgroup m17nError Error Handling */
@@ -77,9 +85,11 @@ enum MErrorCode
     MERROR_FRAME,
     MERROR_FACE,
     MERROR_DRAW,
+    MERROR_FLT,
     MERROR_FONT,
     MERROR_FONTSET,
     MERROR_FONT_OTF,
+    MERROR_FONT_X,
     MERROR_FONT_FT,
     MERROR_IM,
     MERROR_DB,
@@ -92,8 +102,6 @@ enum MErrorCode
 
 /*=*/
 
-extern int merror_code;
-
 extern void (*m17n_memory_full_handler) (enum MErrorCode err);
 
 /*=*/
@@ -114,6 +122,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_ */
 
 /*