[multiple changes]

2009-04-16  Bob Duff  <duff@adacore.com>

	* exp_ch6.ads, exp_ch6.adb (Is_Build_In_Place_Function_Return): Remove,
	unused.

2009-04-16  Thomas Quinot  <quinot@adacore.com>

	* sem_ch4.adb: Minor reformatting

	* adaint.c: Remove junk duplicated code.

	* sem_ch3.adb: Minor reformatting

	* exp_dist.adb: Minor comment rewording

From-SVN: r146165

gcc/ada/ChangeLog

+2009-04-16  Bob Duff  <duff@adacore.com>
+
+	* exp_ch6.ads, exp_ch6.adb (Is_Build_In_Place_Function_Return): Remove,
+	unused.
+
+2009-04-16  Thomas Quinot  <quinot@adacore.com>
+
+	* sem_ch4.adb: Minor reformatting
+
+	* adaint.c: Remove junk duplicated code.
+
+	* sem_ch3.adb: Minor reformatting
+
+	* exp_dist.adb: Minor comment rewording
+
 2009-04-16  Robert Dewar  <dewar@adacore.com>
 
 	* gnat_rm.texi: Document effect of Assume_No_Invalid_Values and -gnatVa

gcc/ada/adaint.c

@@ -469,7 +469,7 @@ __gnat_symlink (char *oldpath ATTRIBUTE_UNUSED,
 /* Try to lock a file, return 1 if success.  */
 
 #if defined (__vxworks) || defined (__nucleus__) || defined (MSDOS) \
-  || defined (_WIN32)
+  || defined (_WIN32) || defined (__EMX__) || defined (VMS)
 
 /* Version that does not use link. */
 
@@ -501,27 +501,6 @@ __gnat_try_lock (char *dir, char *file)
   return 1;
 }
 
-#elif defined (__EMX__) || defined (VMS)
-
-/* More cases that do not use link; identical code, to solve too long
-   line problem ??? */
-
-int
-__gnat_try_lock (char *dir, char *file)
-{
-  char full_path[256];
-  int fd;
-
-  sprintf (full_path, "%s%c%s", dir, DIR_SEPARATOR, file);
-  fd = open (full_path, O_CREAT | O_EXCL, 0600);
-
-  if (fd < 0)
-    return 0;
-
-  close (fd);
-  return 1;
-}
-
 #else
 
 /* Version using link(), more secure over NFS.  */

gcc/ada/exp_ch6.adb

@@ -4748,22 +4748,6 @@ package body Exp_Ch6 is
       end if;
    end Is_Build_In_Place_Function_Call;
 
-   ---------------------------------------
-   -- Is_Build_In_Place_Function_Return --
-   ---------------------------------------
-
-   function Is_Build_In_Place_Function_Return (N : Node_Id) return Boolean is
-   begin
-      if Nkind_In (N, N_Simple_Return_Statement,
-                      N_Extended_Return_Statement)
-      then
-         return Is_Build_In_Place_Function
-                  (Return_Applies_To (Return_Statement_Entity (N)));
-      else
-         return False;
-      end if;
-   end Is_Build_In_Place_Function_Return;
-
    -----------------------
    -- Freeze_Subprogram --
    -----------------------

gcc/ada/exp_ch6.ads

@@ -112,11 +112,6 @@ package Exp_Ch6 is
    --  that requires handling as a build-in-place call or is a qualified
    --  expression applied to such a call; otherwise returns False.
 
-   function Is_Build_In_Place_Function_Return (N : Node_Id) return Boolean;
-   --  Ada 2005 (AI-318-02): Returns True if N is an N_Simple_Return_Statement
-   --  or N_Extended_Return_Statement and it applies to a build-in-place
-   --  function or generic function.
-
    procedure Make_Build_In_Place_Call_In_Allocator
      (Allocator     : Node_Id;
       Function_Call : Node_Id);

gcc/ada/exp_dist.adb

@@ -8528,7 +8528,7 @@ package body Exp_Dist is
                     Parameter_Type => New_Occurrence_Of (RTE (RE_Any), Loc))),
                 Result_Definition => New_Occurrence_Of (Typ, Loc));
 
-            --  The following  is taken care of by Exp_Dist.Add_RACW_From_Any
+            --  The RACW case is taken care of by Exp_Dist.Add_RACW_From_Any
 
             pragma Assert
               (not (Is_Remote_Access_To_Class_Wide_Type (Typ)));

gcc/ada/sem_ch3.adb

@@ -3330,7 +3330,7 @@ package body Sem_Ch3 is
       --  extension with a synchronized parent must be explicitly declared
       --  synchronized, because the full view will be a synchronized type.
       --  This must be checked before the check for limited types below,
-      --  to ensure that types declared limited are not allowed extend
+      --  to ensure that types declared limited are not allowed to extend
       --  synchronized interfaces.
 
       elsif Is_Interface (Parent_Type)

gcc/ada/sem_ch4.adb

@@ -4760,7 +4760,7 @@ package body Sem_Ch4 is
             null;
 
          else
-            --  Save candidate type for subsquent error message, if any.
+            --  Save candidate type for subsquent error message, if any
 
             if not Is_Limited_Type (T1) then
                Candidate_Type := T1;