--- source-old/userio.c	Sat May  1 06:01:31 1999
+++ source/userio.c	Sun Jan 16 18:43:26 2000
@@ -76,9 +76,14 @@
 int CDECL Warning(DBL level, char *format,...)
 {
   va_list marker;
+  char *vspointer = vsbuffer;
 
   va_start(marker, format);
-  vsprintf(vsbuffer, format, marker);
+  if (Data_File != NULL && Data_File->Filename != NULL)
+  {
+    vspointer += sprintf (vspointer, "%s:%d: ", Data_File->Filename, Data_File->Line_Number + 1);
+  }
+  vsprintf(vspointer, format, marker);
   va_end(marker);
   
   if (level >= opts.Language_Version)
--- source-old/tokenize.h	Sat May  1 06:01:30 1999
+++ source/tokenize.h	Sun Jan 16 18:34:48 2000
@@ -98,6 +99,7 @@
 extern int Table_Index;
 extern int token_count;
 
+extern DATA_FILE *Data_File; /* Current parsing file */
 
 
 /*****************************************************************************
--- source/tokenize.c~	Sun Jan 16 16:43:53 2000
+++ source/tokenize.c	Sun Jan 16 18:35:07 2000
@@ -107,7 +107,7 @@
 static int line_count = 10;
 
 static int Include_File_Index;
-static DATA_FILE *Data_File;
+DATA_FILE *Data_File = NULL;
 static DATA_FILE Include_Files[MAX_INCLUDE_FILES];
 
 struct Token_Struct Token;