commit b0c6e36d5d56ff459430427c5227996d6f371fcf
author Alexandre Julliard <julliard@winehq.org> Tue Aug 27 22:32:01 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 27 22:32:01 2002 +0000
tree d366f55230c6c00bbc6492c43e7c78e0b4ef4b84
parent f08b186373c23a547c0ef5571dd7862e4dd456b9

Fixed line numbers in error messages and improved redefinition error
(based on a patch by Jon Griffiths).

tools/winebuild/parser.c

diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index 886bc4c..383d4b2 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -481,8 +481,9 @@
         if (!strcmp( Names[i]->name, Names[i+1]->name ))
         {
             current_line = max( Names[i]->lineno, Names[i+1]->lineno );
-            fatal_error( "'%s' redefined (previous definition at line %d)\n",
-                         Names[i]->name, min( Names[i]->lineno, Names[i+1]->lineno ) );
+            fatal_error( "'%s' redefined\n%s:%d: First defined here\n",
+                         Names[i]->name, input_file_name,
+                         min( Names[i]->lineno, Names[i+1]->lineno ) );
         }
     }
 }
@@ -498,7 +499,7 @@
     const char *token;
 
     input_file = file;
-    current_line = 1;
+    current_line = 0;
     if (owner_name[0]) SpecType = SPEC_WIN16;
 
     while ((token = GetToken(1)) != NULL)