===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/mdef.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/m4/mdef.h	2000/03/11 15:54:44	1.14
--- src/usr.bin/m4/mdef.h	2000/07/02 01:17:00	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: mdef.h,v 1.14 2000/03/11 15:54:44 espie Exp $	*/
  /*	$NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: mdef.h,v 1.15 2000/07/02 01:17:00 espie Exp $	*/
  /*	$NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $	*/
  
  /*
***************
*** 112,119 ****
  #define MAXOUT          10              /* maximum # of diversions 	    */
  #define MAXSTR          512             /* maximum size of string  	    */
  #define BUFSIZE         4096            /* starting size of pushback buffer */
! #define STACKMAX        4096            /* size of call stack      	    */
! #define STRSPMAX        4096            /* starting size of string space    */
  #define MAXTOK          MAXSTR          /* maximum chars in a tokn 	    */
  #define HASHSIZE        199             /* maximum size of hashtab 	    */
  #define MAXCCHARS	5		/* max size of comment/quote delim  */
--- 112,119 ----
  #define MAXOUT          10              /* maximum # of diversions 	    */
  #define MAXSTR          512             /* maximum size of string  	    */
  #define BUFSIZE         4096            /* starting size of pushback buffer */
! #define INITSTACKMAX    4096           	/* starting size of call stack      */
! #define STRSPMAX        64             /* starting size of string space    */
  #define MAXTOK          MAXSTR          /* maximum chars in a tokn 	    */
  #define HASHSIZE        199             /* maximum size of hashtab 	    */
  #define MAXCCHARS	5		/* max size of comment/quote delim  */
***************
*** 168,176 ****
   *      pushs() - push a string pointer onto stack
   */
  #define gpbc() 	 (bp > bufbase) ? *--bp : obtain_char(infile+ilevel)
! #define pushf(x) if (sp < STACKMAX) mstack[++sp].sfra = (x)
! #define pushs(x) if (sp < STACKMAX) mstack[++sp].sstr = (x)
  
  /*
   *	    .				   .
   *	|   .	|  <-- sp		|  .  |
--- 168,197 ----
   *      pushs() - push a string pointer onto stack
   */
  #define gpbc() 	 (bp > bufbase) ? *--bp : obtain_char(infile+ilevel)
! #define pushf(x) 			\
! 	do {				\
! 		if (++sp == STACKMAX) 	\
! 			enlarge_stack();\
! 		mstack[sp].sfra = (x);	\
! 		sstack[sp] = 0; \
! 	} while (0);
  
+ #define pushs(x) 			\
+ 	do {				\
+ 		if (++sp == STACKMAX) 	\
+ 			enlarge_stack();\
+ 		mstack[sp].sstr = (x);	\
+ 		sstack[sp] = 1; \
+ 	} while (0);
+ 
+ #define pushs1(x) 			\
+ 	do {				\
+ 		if (++sp == STACKMAX) 	\
+ 			enlarge_stack();\
+ 		mstack[sp].sstr = (x);	\
+ 		sstack[sp] = 0; \
+ 	} while (0);
+ 
  /*
   *	    .				   .
   *	|   .	|  <-- sp		|  .  |
***************
*** 196,201 ****
   */
  #define PARLEV  (mstack[fp].sfra)
  #define CALTYP  (mstack[fp-1].sfra)
! #define PREVEP	compute_prevep() 
  #define PREVSP	(fp-3)
  #define PREVFP	(mstack[fp-2].sfra)
--- 217,222 ----
   */
  #define PARLEV  (mstack[fp].sfra)
  #define CALTYP  (mstack[fp-1].sfra)
! #define PREVEP	(mstack[fp+3].sstr)
  #define PREVSP	(fp-3)
  #define PREVFP	(mstack[fp-2].sfra)