2
0
Эх сурвалжийг харах

* fix for Mantis #36121: define FPC_ISO and FPC_EXTENDEDPASCAL for modes ISO and EXTENDEDPASCAL respectively

git-svn-id: trunk@43114 -
svenbarth 5 жил өмнө
parent
commit
562d345060

+ 10 - 2
compiler/scanner.pas

@@ -615,7 +615,11 @@ implementation
               undef_system_macro('FPC_GPC')
               undef_system_macro('FPC_GPC')
 {$endif}
 {$endif}
             else if (m_mac in oldmodeswitches) then
             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 }
             { define new symbol in delphi,objfpc,tp,gpc,macpas mode }
             if (m_delphi in current_settings.modeswitches) then
             if (m_delphi in current_settings.modeswitches) then
@@ -629,7 +633,11 @@ implementation
               def_system_macro('FPC_GPC')
               def_system_macro('FPC_GPC')
 {$endif}
 {$endif}
             else if (m_mac in current_settings.modeswitches) then
             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;
          end;
 
 
         SetCompileMode:=b;
         SetCompileMode:=b;