X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fcm.c;h=98f3f42f3d80c1e019e176dc096c9c1f90907859;hb=60d2b57b2fdc60d3a6a151a67f95b88db825084b;hp=3e5fa89fa68a27e0668885ec75248eaf08caf366;hpb=3e447015251ce6dcde843cbed10d9033d5538622;p=chise%2Fxemacs-chise.git.1

diff --git a/src/cm.c b/src/cm.c
index 3e5fa89..98f3f42 100644
--- 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');