(g2-UU+5B73): Add `=decomposition@hanyo-denshi'.

[chise/xemacs-chise.git.1] / src / cm.c

diff --git a/src/cm.c b/src/cm.c
index c0dfd09..98f3f42 100644 (file)
--- a/src/cm.c
+++ b/src/cm.c
@@ -33,14 +33,8 @@ Boston, MA 02111-1307, USA.  */
 
 #define        EXPENSIVE 2000
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern char *tgoto (CONST char *cm, int hpos, int vpos);
-extern void tputs (CONST char *, int, void (*)(int));
-#ifdef __cplusplus
-}
-#endif
+EXTERN_C char *tgoto (const char *cm, int hpos, int vpos);
+EXTERN_C int tputs (const char *, int, void (*)(int));
 
 static void cmgoto_for_real (struct console *c, int row, int col);
 
@@ -105,7 +99,7 @@ cmcheckmagic (void)
   if (curX == FrameCols)
     {
       if (!MagicWrap || curY >= FrameRows - 1)
-       abort ();
+       ABORT ();
       if (termscript)
        putc ('\r', termscript);
       putchar ('\r');