=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/macro.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- src/usr.bin/mg/macro.h 2001/05/24 03:05:24 1.4 +++ src/usr.bin/mg/macro.h 2004/02/01 22:26:41 1.5 @@ -1,25 +1,19 @@ -/* $OpenBSD: macro.h,v 1.4 2001/05/24 03:05:24 mickey Exp $ */ +/* $OpenBSD: macro.h,v 1.5 2004/02/01 22:26:41 vincent Exp $ */ /* definitions for keyboard macros */ -#ifndef EXTERN -#define EXTERN extern -#define INIT(i) -#endif - #define MAXMACRO 256 /* maximum functs in a macro */ -EXTERN int inmacro INIT(FALSE); -EXTERN int macrodef INIT(FALSE); -EXTERN int macrocount INIT(0); +extern int inmacro; +extern int macrodef; +extern int macrocount; -EXTERN union { +union macrodef { PF m_funct; int m_count; /* for count-prefix */ -} macro[MAXMACRO]; +}; -EXTERN LINE *maclhead INIT(NULL); -EXTERN LINE *maclcur; +extern union macrodef macro[MAXMACRO]; -#undef EXTERN -#undef INIT +extern LINE *maclhead; +extern LINE *maclcur;