From 11fbb1cc6db3458fb0626fc45ed64ae2f1ac71a7 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 30 Sep 2000 16:07:20 +0000 Subject: [PATCH] * prefix fix (merged) --- compiler/comphook.pas | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/compiler/comphook.pas b/compiler/comphook.pas index 9e4e61c647..52799c80c1 100644 --- a/compiler/comphook.pas +++ b/compiler/comphook.pas @@ -272,21 +272,26 @@ begin begin if status.use_gccoutput then hs:=gccfilename(status.currentsource)+':'+tostr(status.currentline)+': '+hs+' '+ - tostr(status.currentcolumn)+': ' + tostr(status.currentcolumn)+': '+s else hs:=status.currentsource+'('+tostr(status.currentline)+ - ','+tostr(status.currentcolumn)+') '+hs+' '; + ','+tostr(status.currentcolumn)+') '+hs+' '+s; end else begin if status.use_gccoutput then - hs:=gccfilename(status.currentsource)+': '+hs+' '+tostr(status.currentline)+': ' + hs:=gccfilename(status.currentsource)+': '+hs+' '+tostr(status.currentline)+': '+s else - hs:=status.currentsource+'('+tostr(status.currentline)+') '+hs+' '; + hs:=status.currentsource+'('+tostr(status.currentline)+') '+hs+' '+s; end; + end + else + begin + if hs<>'' then + hs:=hs+' '+s + else + hs:=s; end; - { add the message to the text } - hs:=hs+s; {$ifdef FPC} if status.use_stderr then begin @@ -361,7 +366,10 @@ end; end. { $Log$ - Revision 1.7 2000-09-24 21:33:46 peter + Revision 1.8 2000-09-30 16:07:20 peter + * prefix fix (merged) + + Revision 1.7 2000/09/24 21:33:46 peter * message updates merges Revision 1.6 2000/09/24 15:06:13 peter