From 29c38396b50299b35f21765a5d44f3aa7ad07602 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Mon, 19 Jan 2015 19:00:18 +0000 Subject: [PATCH] re PR ada/64640 (Ada build failure on cygwin-32) 2015-01-19 Bernd Edlinger PR ada/64640 * adaint.c: Handle __CYGWIN__ like __MINGW32__ here. * mingw32.h: Don't include under cygwin. (_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Set to _O_TEXT if not yet defined. From-SVN: r219855 --- gcc/ada/ChangeLog | 7 +++++++ gcc/ada/adaint.c | 2 +- gcc/ada/mingw32.h | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c130f7d22d43..6d50312902d3 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2015-01-19 Bernd Edlinger + + PR ada/64640 + * adaint.c: Handle __CYGWIN__ like __MINGW32__ here. + * mingw32.h: Don't include under cygwin. + (_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Set to _O_TEXT if not yet defined. + 2015-01-15 Thomas Schwinge * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 1bf7d667629a..ab74ce08a45d 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -106,7 +106,7 @@ extern "C" { #endif -#if defined (__MINGW32__) +#if defined (__MINGW32__) || defined (__CYGWIN__) #if defined (RTX) #include diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index 325c2ae7779b..09343066dfcb 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -49,9 +49,21 @@ #define _WIN32_WINNT 0x0501 #endif +#ifndef __CYGWIN__ #include +#endif #include +#ifndef _O_U8TEXT +#define _O_U8TEXT _O_TEXT +#endif +#ifndef _O_U16TEXT +#define _O_U16TEXT _O_TEXT +#endif +#ifndef _O_WTEXT +#define _O_WTEXT _O_TEXT +#endif + /* After including this file it is possible to use the character t as prefix to routines. If GNAT_UNICODE_SUPPORT is defined then the unicode enabled versions will be used. */ -- 2.47.2