diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-22 10:25:32 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-22 10:25:32 +0000 |
| commit | fbc89b916a7a004f25857943a4795a618a460ea4 (patch) | |
| tree | 01d9b239998961b74425ecccd67bdd82369dfd29 /gcc/ada/prj-conf.adb | |
| parent | 660c48c497a8e4e98d0430fbe584092e45350968 (diff) | |
| download | ppe42-gcc-fbc89b916a7a004f25857943a4795a618a460ea4.tar.gz ppe42-gcc-fbc89b916a7a004f25857943a4795a618a460ea4.zip | |
2009-07-22 Robert Dewar <dewar@adacore.com>
* s-stchop.adb, a-direct.adb, a-ztexio.adb, gnatchop.adb, prj-proc.adb,
make.adb, s-regpat.adb, ali-util.adb, a-ngcefu.adb, prep.adb,
s-tassta.adb, a-tifiio.adb, a-textio.adb, prj.adb, uintp.adb,
s-valrea.adb, a-ngelfu.adb, prepcomp.adb, sinput-l.adb, vms_conv.adb,
errout.adb, g-alleve.adb, repinfo.adb, a-wtedit.adb, ali.adb,
a-witeio.adb, prj-dect.adb, prj-nmsc.adb, sinput-c.adb, binde.adb,
s-regexp.adb, s-imgrea.adb, a-teioed.adb, errutil.adb, prj-util.adb,
a-ztedit.adb, gnatls.adb, prj-conf.adb, bcheck.adb, s-scaval.adb,
erroutc.adb, osint.adb, a-strfix.adb, s-fileio.adb: Make sure sources
obey short-circuit style rule.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149921 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-conf.adb')
| -rw-r--r-- | gcc/ada/prj-conf.adb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/prj-conf.adb b/gcc/ada/prj-conf.adb index b258ee9d980..fee0bbfa235 100644 --- a/gcc/ada/prj-conf.adb +++ b/gcc/ada/prj-conf.adb @@ -351,7 +351,7 @@ package body Prj.Conf is end if; if Target = "" then - OK := not Autoconf_Specified or Tgt_Name = No_Name; + OK := not Autoconf_Specified or else Tgt_Name = No_Name; else OK := Tgt_Name /= No_Name and then Target = Get_Name_String (Tgt_Name); @@ -705,7 +705,7 @@ package body Prj.Conf is -- gprconfig. if not Is_Directory (Obj_Dir) - and then (Setup_Projects or Subdirs /= null) + and then (Setup_Projects or else Subdirs /= null) then begin Create_Path (Obj_Dir); @@ -883,8 +883,8 @@ package body Prj.Conf is -- auto-conf mode, since the appropriate target was passed to gprconfig. if not Automatically_Generated - and not Check_Target - (Config, Autoconf_Specified, Project_Tree, Target_Name) + and then not + Check_Target (Config, Autoconf_Specified, Project_Tree, Target_Name) then Automatically_Generated := True; goto Process_Config_File; |
