From 8e473f4f441b026599af595bc28125db87410873 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 5 Oct 2017 16:32:21 +0000 Subject: [PATCH] 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 --- gcc/ada/ChangeLog | 6 ++++++ gcc/ada/mingw32.h | 10 ---------- gcc/ada/sysdep.c | 8 ++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 86ff9ed9465..f4588406422 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2017-10-05 Eric Botcazou + + 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 Pierre-Marie de Rodat diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index cf2d9de1715..91f85f80f93 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -59,16 +59,6 @@ #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. */ diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index 455a78a5645..698c8ca04f7 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 #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; -- 2.30.2