[multiple changes]

2009-11-30  Jerome Lambourg  <lambourg@adacore.com>

	* exp_ch3.adb (Make_Predefined_Primitive_Specs): Improve comment for
	the Value_Type case.

2009-11-30  Thomas Quinot  <quinot@adacore.com>

	* a-textio.adb: Minor reformatting

2009-11-30  Pascal Obry  <obry@adacore.com>

	* adaint.c: Fix bug in passing parameter.
	* expect.c: Include io.h to get definition of _open_osfhandle

From-SVN: r154810

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6477c1e..1c071f6 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-30  Jerome Lambourg  <lambourg@adacore.com>
+
+       * exp_ch3.adb (Make_Predefined_Primitive_Specs): Improve comment for
+       the Value_Type case.
+
+2009-11-30  Thomas Quinot  <quinot@adacore.com>
+
+       * a-textio.adb: Minor reformatting
+
+2009-11-30  Pascal Obry  <obry@adacore.com>
+
+       * adaint.c: Fix bug in passing parameter.
+       * expect.c: Include io.h to get definition of _open_osfhandle
+
 2009-11-30  Javier Miranda  <miranda@adacore.com>
 
        * exp_ch6.adb, sem_scil.adb (Adjust_SCIL_Node): Add missing management

diff --git a/gcc/ada/a-textio.adb b/gcc/ada/a-textio.adb
index ceacfe5..0dd5463 100644 (file)
--- a/gcc/ada/a-textio.adb
+++ b/gcc/ada/a-textio.adb
@@ -1659,8 +1659,8 @@ package body Ada.Text_IO is
    begin
       --  Don't allow change of mode for current file (RM A.10.2(5))
 
-      if (File = Current_In or else
-          File = Current_Out  or else
+      if (File = Current_In  or else
+          File = Current_Out or else
           File = Current_Error)
         and then To_FCB (Mode) /= File.Mode
       then

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 5bce387..b4446f7 100644 (file)
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -697,7 +697,7 @@ __gnat_os_filename (char *filename ATTRIBUTE_UNUSED,
                    char *encoding ATTRIBUTE_UNUSED, int *e_length)
 {
 #if defined (_WIN32) && ! defined (__vxworks) && ! defined (IS_CROSS)
-  WS2SC (os_name, (TCHAR *)w_filename, (DWORD)o_length);
+  WS2SC (os_name, (TCHAR *)w_filename, (DWORD)*o_length);
   *o_length = strlen (os_name);
   strcpy (encoding, "encoding=utf8");
   *e_length = strlen (encoding);

diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 13454c7..17e6395 100644 (file)
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -8104,7 +8104,8 @@ package body Exp_Ch3 is
       elsif Restriction_Active (No_Finalization) then
          null;
 
-      --  We skip these for CIL Value types (why???)
+      --  We skip these for CIL Value types, where finalization is not
+      --  available
 
       elsif Is_Value_Type (Tag_Typ) then
          null;

diff --git a/gcc/ada/expect.c b/gcc/ada/expect.c
index c11a3aa..c013feb 100644 (file)
--- a/gcc/ada/expect.c
+++ b/gcc/ada/expect.c
@@ -78,12 +78,11 @@
 
 #ifdef _WIN32
 
-/* We need functionality available only starting with Windows XP */
-#define _WIN32_WINNT 0x0501
-
 #include <windows.h>
 #include <process.h>
 #include <signal.h>
+#include <io.h>
+#include "mingw32.h"
 
 void
 __gnat_kill (int pid, int sig, int close)