* prj-conf.ads, prj-conf.adb: Switch to GPLv3.

[pf3gnuchains/gcc-fork.git] / gcc / ada / prj.adb

diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index a8c22f7..fb002f4 100644 (file)
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -299,7 +299,8 @@ package body Prj is
    procedure Expect (The_Token : Token_Type; Token_Image : String) is
    begin
       if Token /= The_Token then
-         Error_Msg (Token_Image & " expected", Token_Ptr);
+         --  ??? Should pass user flags here instead
+         Error_Msg (Gnatmake_Flags, Token_Image & " expected", Token_Ptr);
       end if;
    end Expect;
 
@@ -979,7 +980,7 @@ package body Prj is
       Only_If_Ada         : Boolean := False) return Path_Name_Type
    is
    begin
-      if (Project.Library and Including_Libraries)
+      if (Project.Library and then Including_Libraries)
         or else
           (Project.Object_Directory /= No_Path_Information
             and then (not Including_Libraries or else not Project.Library))
@@ -1179,7 +1180,7 @@ package body Prj is
    ------------------
 
    function Create_Flags
-     (Report_Error               : Put_Line_Access;
+     (Report_Error               : Error_Handler;
       When_No_Sources            : Error_Warning;
       Require_Sources_Other_Lang : Boolean := True;
       Allow_Duplicate_Basenames  : Boolean := True;