From 91016cff990a47d0f488e3dfdbf3f40e3bffa191 Mon Sep 17 00:00:00 2001
From: "nethack.allison" <nethack.allison>
Date: Wed, 21 May 2008 02:15:09 +0000
Subject: [PATCH] makedefs build on non-C99 compilers follow up

Pat Rankin wrote:
>      That patch looks incorrect.  `CONSUME' increments argv,
> so now a different value is being passed to the function when
> initializing that variable than was passed before.
---
 util/makedefs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/util/makedefs.c b/util/makedefs.c
index ca1b18e23..6b90a14fe 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -422,8 +422,9 @@ do_ext_makedefs(int argc, char **argv){
 			CONTINUE;
 		}
 		IS_OPTION("grep-define"){
-			struct grep_var *p = grepsearch(argv[0]);
+			struct grep_var *p;
 			CONSUME;
+			p = grepsearch(argv[0]);
 			if(p){
 				p->is_defined = 1;
 			} else {
@@ -433,8 +434,9 @@ do_ext_makedefs(int argc, char **argv){
 			CONTINUE;
 		}
 		IS_OPTION("grep-undef"){
-			struct grep_var *p = grepsearch(argv[0]);
+			struct grep_var *p;
 			CONSUME;
+			p = grepsearch(argv[0]);
 			if(p){
 				p->is_defined = 0;
 			} else {