OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR ada/82393 (Compilation error on cygwin64)

Browse Source 
PR ada/82393
	* mingw32.h (_O_U8TEXT, _O_U16TEXT, _O_WTEXT): Delete.
	* sysdep.c (__gnat_set_mode ): Use DJGPP version for Cygwin.

From-SVN: r253455
This commit is contained in:
Eric Botcazou 2017-10-05 16:32:40 +00:00 committed by Eric Botcazou
parent 43ea71b175
commit f64766fde8
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ada/ChangeLog
View File

@ -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-09-15 Martin Liska <mliska@suse.cz>
Backport from mainline

10
gcc/ada/mingw32.h
View File

@ -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. */

8
gcc/ada/sysdep.c
View File

@ -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;