===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/mdef.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/m4/mdef.h	2003/06/12 14:36:43	1.24
--- src/usr.bin/m4/mdef.h	2003/06/30 21:42:50	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: mdef.h,v 1.24 2003/06/12 14:36:43 espie Exp $	*/
  /*	$NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: mdef.h,v 1.25 2003/06/30 21:42:50 espie Exp $	*/
  /*	$NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $	*/
  
  /*
***************
*** 85,90 ****
--- 85,91 ----
  #define TRACEONTYPE	42
  #define TRACEOFFTYPE	43
  
+ #define BUILTIN_MARKER	"__builtin_"
   
  #define TYPEMASK	63	/* Keep bits really corresponding to a type. */
  #define RECDEF		256	/* Pure recursive def, don't expand it */
***************
*** 135,150 ****
   
  typedef struct ndblock *ndptr;
   
! struct ndblock {		/* hastable structure         */
! 	char		*name;	/* entry name..               */
  	char		*defn;	/* definition..               */
  	unsigned int	type;	/* type of the entry..        */
- 	unsigned int 	hv;	/* hash function value..      */
- 	ndptr		nxtptr;	/* link to next entry..       */
  };
!  
! #define nil     ((ndptr) 0)
!  
  struct keyblk {
          char    *knam;          /* keyword name */
          int     ktyp;           /* keyword type */
--- 136,146 ----
   
  typedef struct ndblock *ndptr;
   
! struct macro_definition {
  	char		*defn;	/* definition..               */
  	unsigned int	type;	/* type of the entry..        */
  };
! 
  struct keyblk {
          char    *knam;          /* keyword name */
          int     ktyp;           /* keyword type */