PR middle-end/46844

[pf3gnuchains/gcc-fork.git] / gcc / ada / g-enblsp-vms-ia64.adb

diff --git a/gcc/ada/g-enblsp-vms-ia64.adb b/gcc/ada/g-enblsp-vms-ia64.adb
index 0224a3d..6ac7c5a 100644 (file)
--- a/gcc/ada/g-enblsp-vms-ia64.adb
+++ b/gcc/ada/g-enblsp-vms-ia64.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---              Copyright (C) 2005 Ada Core Technologies, Inc.              --
+--                    Copyright (C) 2005-2009, AdaCore                      --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -35,7 +35,7 @@
 --  for use by the VMS GNAT.Expect package (g-expect-vms.adb). This package
 --  should not be directly with'ed by an application program.
 
---  This version is for IA64/VMS.
+--  This version is for IA64/VMS
 
 separate (GNAT.Expect)
 procedure Non_Blocking_Spawn
@@ -73,29 +73,26 @@ begin
       raise Invalid_Process;
    end if;
 
-   --  Fork a new process. It's not possible to do this in a subprogram.
+   --  Fork a new process (it is not possible to do this in a subprogram)
 
-   if Alloc_Vfork_Blocks >= 0 then
-      Descriptor.Pid := Setjmp1 (Get_Vfork_Jmpbuf);
-   else
-      Descriptor.Pid := -1;
-   end if;
+   Descriptor.Pid :=
+     (if Alloc_Vfork_Blocks >= 0 then Setjmp1 (Get_Vfork_Jmpbuf) else -1);
 
-   --  Are we now in the child (or, for Windows, still in the common
-   --  process).
+   --  Are we now in the child
 
    if Descriptor.Pid = Null_Pid then
+
       --  Prepare an array of arguments to pass to C
 
       Arg   := new String (1 .. Command_With_Path'Length + 1);
       Arg (1 .. Command_With_Path'Length) := Command_With_Path.all;
-      Arg (Arg'Last)        := ASCII.Nul;
+      Arg (Arg'Last)        := ASCII.NUL;
       Arg_List (1)          := Arg.all'Address;
 
       for J in Args'Range loop
          Arg                     := new String (1 .. Args (J)'Length + 1);
          Arg (1 .. Args (J)'Length)  := Args (J).all;
-         Arg (Arg'Last)              := ASCII.Nul;
+         Arg (Arg'Last)              := ASCII.NUL;
          Arg_List (J + 2 - Args'First) := Arg.all'Address;
       end loop;