From 562d345060228a279bcc9e40c1892ae5917d8adf Mon Sep 17 00:00:00 2001 From: svenbarth Date: Thu, 3 Oct 2019 12:34:36 +0000 Subject: [PATCH] * fix for Mantis #36121: define FPC_ISO and FPC_EXTENDEDPASCAL for modes ISO and EXTENDEDPASCAL respectively git-svn-id: trunk@43114 - --- compiler/scanner.pas | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/compiler/scanner.pas b/compiler/scanner.pas index 73aa9cf0b9..3fe7561dff 100644 --- a/compiler/scanner.pas +++ b/compiler/scanner.pas @@ -615,7 +615,11 @@ implementation undef_system_macro('FPC_GPC') {$endif} else if (m_mac in oldmodeswitches) then - undef_system_macro('FPC_MACPAS'); + undef_system_macro('FPC_MACPAS') + else if (m_iso in oldmodeswitches) then + undef_system_macro('FPC_ISO') + else if (m_extpas in oldmodeswitches) then + undef_system_macro('FPC_EXTENDEDPASCAL'); { define new symbol in delphi,objfpc,tp,gpc,macpas mode } if (m_delphi in current_settings.modeswitches) then @@ -629,7 +633,11 @@ implementation def_system_macro('FPC_GPC') {$endif} else if (m_mac in current_settings.modeswitches) then - def_system_macro('FPC_MACPAS'); + def_system_macro('FPC_MACPAS') + else if (m_iso in current_settings.modeswitches) then + def_system_macro('FPC_ISO') + else if (m_extpas in current_settings.modeswitches) then + def_system_macro('FPC_EXTENDEDPASCAL'); end; SetCompileMode:=b;