663a664
>   macro->count = 0;
842c843
< 	      /* Sub in the macro invocation number.  */
---
> 	      /* Sub in the global macro invocation count.  */
846c847,874
< 	      sprintf (buffer, "%d", macro_number);
---
> 		  sprintf (buffer, "%d", macro_number);
> 	      sb_add_string (out, buffer);
> 	    }
> 	  else if (src < in->len && in->ptr[src] == '#')
> 	    {
> 	      /* Sub in the macro global invocation count.  */
> 
> 	      char buffer[10];
> 	      src++;
> 		  sprintf (buffer, "%d", macro->count);
> 	      sb_add_string (out, buffer);
> 	    }
> 	  else if (src < in->len && in->ptr[src] == '<')
> 	    {
> 	      /* Sub in the macro global invocation count.  */
> 
> 	      char buffer[10];
> 	      src++;
> 		  sprintf (buffer, "%d", macro->count - 1);
> 	      sb_add_string (out, buffer);
> 	    }
> 	  else if (src < in->len && in->ptr[src] == '>')
> 	    {
> 	      /* Sub in the macro global invocation count.  */
> 
> 	      char buffer[10];
> 	      src++;
> 		  sprintf (buffer, "%d", macro->count + 1);
1031a1060,1062
>   
>   /* increase invocation counter */
>   m->count++;