- -CPPAKCSET=NORMAL and CPPAKCSET=DEFAULT should set setalloc to 0 as $PACKSET=... with the same parameters does

git-svn-id: trunk@23893 -

compiler/options.pas

@@ -920,9 +920,9 @@ begin
                         if upper(copy(more,1,pos('=',more)-1))='PACKSET' then
                           begin
                             delete(more,1,pos('=',more));
-                            if more='0' then
+                            if (more='0') or (more='DEFAULT') or (more='NORMAL') then
                               init_settings.setalloc:=0
-                            else if (more='1') or (more='DEFAULT') or (more='NORMAL') then
+                            else if  more='1' then
                               init_settings.setalloc:=1
                             else if more='2' then
                               init_settings.setalloc:=2

compiler/scandir.pas

@@ -945,7 +945,7 @@ unit scandir;
         if not(c in ['1','2','4','8']) then
          begin
            hs:=current_scanner.readid;
-           if (hs='FIXED') or ((hs='DEFAULT') OR (hs='NORMAL')) then
+           if (hs='FIXED') or (hs='DEFAULT') OR (hs='NORMAL') then
             current_settings.setalloc:=0               {Fixed mode, sets are 4 or 32 bytes}
            else
             Message(scan_e_only_packset);