From ca0eb951e3e6cbee039db654df513d823fa86c78 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 12 Jan 2017 17:01:16 +0100 Subject: [multiple changes] 2017-01-12 Tristan Gingold * s-mmap.ads, s-mmap.adb, s-mmosin-unix.ads, s-mmosin-unix.adb, s-mmauni-long.ads, s-mmosin-mingw.ads, s-mmosin-mingw.adb: New files. 2017-01-12 Yannick Moy * errout.adb, errout.ads (Initialize): Factor common treatment in Reset_Warnings. (Reset_Warnings): New procedure to reset counts related to warnings. (Record_Compilation_Errors): New variable to store the presence of an error, used in gnat2why to allow changing the Warning_Mode. (Compilation_Errors): Use new variable Record_Compilation_Errors to store the presence of an error. 2017-01-12 Javier Miranda * sem_ch13.adb (Analyze_Aspect_Specifications): For Interrupt_Handler and Attach_ Handler aspects, decorate the internally built reference to the protected procedure as coming from sources and force its analysis. 2017-01-12 Ed Schonberg * sem_ch3.adb (Build_Derived_Type): For a scalar derived type, inherit predicates if any from the first_subtype of the parent, not from the anonymous parent type. * sem_eval.adb (Is_Static_Subtype): A type that inherits a dynamic predicate is not a static subtype. 2017-01-12 Gary Dismukes * freeze.adb (Check_Suspicious_Convention): New procedure performing a warning check on discriminated record types with convention C or C++. Factored out of procedure Freeze_Record_Type, and changed to only apply to base types (to avoid spurious warnings on subtypes). Minor improvement of warning messages to refer to discriminated rather than variant record types. (Freeze_Record_Type): Remove code for performing a suspicious convention check. (Freeze_Entity): Only call Freeze_Record_Type on types that aren't declared within any enclosing generic units (rather than just excluding the type when the innermost scope is generic). Call Check_Suspicious_Convention whether or not the type is declared within a generic unit. * sem_ch8.adb (In_Generic_Scope): Move this function to Sem_Util. * sem_util.ads, sem_util.adb (In_Generic_Scope): New function (moved from Sem_Ch8). 2017-01-12 Tristan Gingold * sysdep.c, adaint.c, rtinit.c, ming32.h: (__gnat_current_codepage): Renamed from CurrentCodePage (__gnat_current_ccs_encoding): Renamed from CurrentCCSEncoding 2017-01-12 Ed Schonberg * sem_ch6.adb (Fully_Conformant_Expressions): Handle properly quantified expressions, following AI12-050: the loop parameters of two quantified expressions are conformant if they have the same identifier. From-SVN: r244369 --- gcc/ada/mingw32.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gcc/ada/mingw32.h') diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index 77caec2..cf2d9de 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -6,7 +6,7 @@ * * * C Header File * * * - * Copyright (C) 2002-2014, Free Software Foundation, Inc. * + * Copyright (C) 2002-2016, Free Software Foundation, Inc. * * * * 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- * @@ -78,14 +78,15 @@ #ifdef GNAT_UNICODE_SUPPORT -extern UINT CurrentCodePage; -extern UINT CurrentCCSEncoding; +extern UINT __gnat_current_codepage; +extern UINT __gnat_current_ccs_encoding; -/* Macros to convert to/from the code page specified in CurrentCodePage. */ +/* Macros to convert to/from the code page specified in + __gnat_current_codepage. */ #define S2WSC(wstr,str,len) \ - MultiByteToWideChar (CurrentCodePage,0,str,-1,wstr,len) + MultiByteToWideChar (__gnat_current_codepage,0,str,-1,wstr,len) #define WS2SC(str,wstr,len) \ - WideCharToMultiByte (CurrentCodePage,0,wstr,-1,str,len,NULL,NULL) + WideCharToMultiByte (__gnat_current_codepage,0,wstr,-1,str,len,NULL,NULL) /* Macros to convert to/from UTF-8 code page. */ #define S2WSU(wstr,str,len) \ -- cgit v1.1