diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2015-01-19 19:00:18 +0000 |
|---|---|---|
| committer | Bernd Edlinger <edlinger@gcc.gnu.org> | 2015-01-19 19:00:18 +0000 |
| commit | 29c38396b50299b35f21765a5d44f3aa7ad07602 (patch) | |
| tree | f2b44e9a41a17fa8608868cae3f2cdafc5fa8ef1 | |
| parent | b9f12a01bedb54d5cd503af4dcfbc696c90afd5c (diff) | |
| download | gcc-29c38396b50299b35f21765a5d44f3aa7ad07602.zip gcc-29c38396b50299b35f21765a5d44f3aa7ad07602.tar.gz gcc-29c38396b50299b35f21765a5d44f3aa7ad07602.tar.bz2 | |
re PR ada/64640 (Ada build failure on cygwin-32)
2015-01-19 Bernd Edlinger <bernd.edlinger@hotmail.de>
PR ada/64640
* adaint.c: Handle __CYGWIN__ like __MINGW32__ here.
* mingw32.h: Don't include <tchar.h> under cygwin.
(_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Set to _O_TEXT if not yet defined.
From-SVN: r219855
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/adaint.c | 2 | ||||
| -rw-r--r-- | gcc/ada/mingw32.h | 12 |
3 files changed, 20 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c130f7d..6d50312 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2015-01-19 Bernd Edlinger <bernd.edlinger@hotmail.de> + + PR ada/64640 + * adaint.c: Handle __CYGWIN__ like __MINGW32__ here. + * mingw32.h: Don't include <tchar.h> under cygwin. + (_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Set to _O_TEXT if not yet defined. + 2015-01-15 Thomas Schwinge <thomas@codesourcery.com> * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index 1bf7d66..ab74ce0 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 <windows.h> diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index 325c2ae..0934306 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -49,9 +49,21 @@ #define _WIN32_WINNT 0x0501 #endif +#ifndef __CYGWIN__ #include <tchar.h> +#endif #include <windows.h> +#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. */ |