From 0816e70ccfa8b42ac5b25fa8ab9c5da2cfea7d58 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Fri, 18 Sep 2009 15:55:20 +0200 Subject: [PATCH] [multiple changes] 2009-09-18 Vincent Celier * prj.ads, prj.adb (Project_Data): New component Imported_Directories_Switches. 2009-09-18 Pascal Obry * mingw32.h: Include standard _mingw.h file. Define _WIN32_WINNT only if not already defined. From-SVN: r151843 --- gcc/ada/ChangeLog | 10 ++++++++++ gcc/ada/mingw32.h | 4 ++++ gcc/ada/prj.adb | 1 + gcc/ada/prj.ads | 4 ++++ 4 files changed, 19 insertions(+) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 647ff0746db..3729771d303 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2009-09-18 Vincent Celier + + * prj.ads, prj.adb (Project_Data): New component + Imported_Directories_Switches. + +2009-09-18 Pascal Obry + + * mingw32.h: Include standard _mingw.h file. + Define _WIN32_WINNT only if not already defined. + 2009-09-18 Thomas Quinot * g-socket.adb (Is_Open): New function indicating whether a diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index 2ad4d36dfa1..011e90bb270 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -36,6 +36,8 @@ #ifndef _MINGW32_H #define _MINGW32_H +#include <_mingw.h> + /* The unicode support is activated by default starting with the 3.9 MingW version. It is not possible to use it with previous version due to a bug in the MingW runtime. */ @@ -62,7 +64,9 @@ #endif /* We need functionality available only starting with Windows XP */ +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0501 +#endif #include #include diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb index b485f706829..d42e7117cd5 100644 --- a/gcc/ada/prj.adb +++ b/gcc/ada/prj.adb @@ -100,6 +100,7 @@ package body Prj is Imported_Projects => null, All_Imported_Projects => null, Ada_Include_Path => null, + Imported_Directories_Switches => null, Ada_Objects_Path => null, Objects_Path => null, Include_Path_File => No_Path, diff --git a/gcc/ada/prj.ads b/gcc/ada/prj.ads index 502ace95f8d..453a7ca4d70 100644 --- a/gcc/ada/prj.ads +++ b/gcc/ada/prj.ads @@ -1190,6 +1190,10 @@ package Prj is -- Miscellaneous -- ------------------- + Imported_Directories_Switches : Argument_List_Access := null; + -- List of the source search switches (-I) to be used + -- when compiling. + Ada_Objects_Path : String_Access := null; -- The cached value of ADA_OBJECTS_PATH for this project file. Do not -- use this field directly outside of the compiler, use