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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219855 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c130f7d22d439ae60a092c4b3b3159daf347618c..6d50312902d3619db8bca38c27c311954c5dd530 100644 (file)
--- 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 1bf7d667629a99f01805413496e5cd222009b267..ab74ce08a45d57949b0199d8f75a0ca6f36e773f 100644 (file)
--- 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 325c2ae7779b8f2a3ca1d30580d55eb367be8eb3..09343066dfcbc7f14df734f3c8541318cda7fb19 100644 (file)
--- 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.  */