diff --git a/rtl/inc/macpas.pp b/rtl/inc/macpas.pp index a42d336c66..fd1d415a2c 100644 --- a/rtl/inc/macpas.pp +++ b/rtl/inc/macpas.pp @@ -37,7 +37,7 @@ function FOUR_CHAR_CODE(literal: string): LongWord; {$ifdef systeminline}inline; {This makes casts from ShortString to FourCharCode automatically, to emulate the behaviour of mac pascal compilers} -operator := (s: ShortString) result: LongWord; {$ifdef systeminline}inline;{$endif} +operator := (s: ShortString) res: LongWord; {$ifdef systeminline}inline;{$endif} implementation @@ -53,9 +53,9 @@ begin FOUR_CHAR_CODE := PLongWord(@literal[1])^; end; -operator := (s: ShortString) result: LongWord; {$ifdef systeminline}inline;{$endif} +operator := (s: ShortString) res: LongWord; {$ifdef systeminline}inline;{$endif} begin - result := PLongWord(@s[1])^; + res := PLongWord(@s[1])^; end; end. diff --git a/rtl/win32/signals.pp b/rtl/win32/signals.pp index cff7fc9afa..b3b441d6e1 100644 --- a/rtl/win32/signals.pp +++ b/rtl/win32/signals.pp @@ -323,12 +323,12 @@ var end; - function API_signals_exception_handler(except : PEXCEPTION_POINTERS) : longint; stdcall; + function API_signals_exception_handler(exceptptrs : PEXCEPTION_POINTERS) : longint; stdcall; begin API_signals_exception_handler:=Signals_exception_handler( - @except^.ExceptionRecord, + @exceptptrs^.ExceptionRecord, nil, - @except^.ContextRecord, + @exceptptrs^.ContextRecord, nil); end;