X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fm17n-misc.h;h=da2f97ff879c8257bc49d1c7bd0708749383605e;hb=0eae0dba032737b26919abd644feff35841297b5;hp=e848a2385953c5a39076940d6cf9d66cd8222ac5;hpb=70e6b990c5f3a38e7295a889d2925ffab922b917;p=m17n%2Fm17n-lib.git

diff --git a/src/m17n-misc.h b/src/m17n-misc.h
index e848a23..da2f97f 100644
--- a/src/m17n-misc.h
+++ b/src/m17n-misc.h
@@ -50,11 +50,10 @@
     m17n ¥é¥¤¥Ö¥é¥ê¥¨¥é¡¼¥³¡¼¥É¤ÎÎóµó
 
     ¥é¥¤¥Ö¥é¥ê¤Î´Ø¿ô¤¬ÂÅÅö¤Ç¤Ê¤¤°ú¿ô¤È¤È¤â¤Ë¸Æ¤Ð¤ì¤¿¾ì¹ç¤Ë¤Ï¡¢ÊÑ¿ô 
-    #merror_code ¤ò¤³¤ì¤é¤ÎÃͤΤɤ줫¤Ë¥»¥Ã¥È¤¹¤ë¡£¤¹¤Ù¤Æ¤Î¥¨¥é¡¼¥³¡¼¥É
-    ¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£
+    #merror_code ¤ò¤³¤ì¤é¤ÎÃͤΤɤ줫¤Ë¥»¥Ã¥È¤¹¤ë¡£¤¹¤Ù¤Æ¤Î¥¨¥é¡¼¥³¡¼¥É¤ÏÀµ¤ÎÀ°¿ô¤Ç¤¢¤ë¡£
 
-    ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¤ÎºÝ¤Ë¤Ï¡¢³°ÉôÊÑ¿ô #m17n_memory_full_handler ¤Î»Ø
-    ¤¹´Ø¿ô¤¬¡¢¤³¤ì¤é¤ÎÃͤΤ¦¤Á¤Î¤É¤ì¤«¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ð¤ì¤ë¡£
+    ¥á¥â¥ê³äÅö¤Æ¥¨¥é¡¼¤ÎºÝ¤Ë¤Ï¡¢³°ÉôÊÑ¿ô #m17n_memory_full_handler 
+    ¤Î»Ø¤¹´Ø¿ô¤¬¡¢¤³¤ì¤é¤ÎÃͤΤ¦¤Á¤Î¤É¤ì¤«¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ð¤ì¤ë¡£
     */
 
 enum MErrorCode
@@ -81,6 +80,7 @@ enum MErrorCode
     MERROR_FONT,
     MERROR_FONTSET,
     MERROR_FONT_OTF,
+    MERROR_FONT_X,
     MERROR_FONT_FT,
     MERROR_IM,
     MERROR_DB,
@@ -93,7 +93,7 @@ enum MErrorCode
 
 /*=*/
 
-extern enum MErrorCode merror_code;
+extern int merror_code;
 
 extern void (*m17n_memory_full_handler) (enum MErrorCode err);