diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2017-10-05 16:32:21 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2017-10-05 16:32:21 +0000 |
| commit | 8e473f4f441b026599af595bc28125db87410873 (patch) | |
| tree | e91f76fd8eba2bff86f5684fcc36b33c5fcd2527 /gcc | |
| parent | 10c98117e8f1dde3b61e3e0d358376b44b1e4b61 (diff) | |
| download | gcc-8e473f4f441b026599af595bc28125db87410873.zip gcc-8e473f4f441b026599af595bc28125db87410873.tar.gz gcc-8e473f4f441b026599af595bc28125db87410873.tar.bz2 | |
re PR ada/82393 (Compilation error on cygwin64)
PR ada/82393
* mingw32.h (_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Delete.
* sysdep.c (__gnat_set_mode ): Use DJGPP version for Cygwin.
From-SVN: r253454
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ada/mingw32.h | 10 | ||||
| -rw-r--r-- | gcc/ada/sysdep.c | 8 |
3 files changed, 10 insertions, 14 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 86ff9ed..f458840 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2017-10-05 Eric Botcazou <ebotcazou@adacore.com> + + PR ada/82393 + * mingw32.h (_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Delete. + * sysdep.c (__gnat_set_mode ): Use DJGPP version for Cygwin. + 2017-10-02 Eric Botcazou <ebotcazou@adacore.com> Pierre-Marie de Rodat <derodat@adacore.com> diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index cf2d9de..91f85f8 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -59,16 +59,6 @@ #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. */ diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index 455a78a..698c8ca 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -126,7 +126,7 @@ extern struct tm *localtime_r(const time_t *, struct tm *); */ -#if defined (WINNT) || defined (__CYGWIN__) || defined(__DJGPP__) +#if defined (WINNT) || defined (__CYGWIN__) || defined (__DJGPP__) const char __gnat_text_translation_required = 1; @@ -137,7 +137,7 @@ const char __gnat_text_translation_required = 1; #define WIN_SETMODE _setmode #endif -#if defined(__DJGPP__) +#if defined (__DJGPP__) #include <io.h> #define _setmode setmode #endif /* __DJGPP__ */ @@ -154,7 +154,7 @@ __gnat_set_text_mode (int handle) WIN_SETMODE (handle, O_TEXT); } -#ifdef __DJGPP__ +#if defined (__CYGWIN__) || defined (__DJGPP__) void __gnat_set_mode (int handle, int mode) { @@ -826,7 +826,7 @@ __gnat_localtime_tzoff (const time_t *timer ATTRIBUTE_UNUSED, #elif defined (__APPLE__) || defined (__FreeBSD__) || defined (__linux__) \ || defined (__GLIBC__) || defined (__DragonFly__) || defined (__OpenBSD__) \ - || defined(__DJGPP__) + || defined (__DJGPP__) { localtime_r (timer, &tp); *off = tp.tm_gmtoff; |