From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Mon, 19 Jan 2015 19:00:18 +0000 (+0000)
Subject: re PR ada/64640 (Ada build failure on cygwin-32)
X-Git-Tag: releases/gcc-5.1.0~1571
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29c38396b50299b35f21765a5d44f3aa7ad07602;p=thirdparty%2Fgcc.git

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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c130f7d22d43..6d50312902d3 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 1bf7d667629a..ab74ce08a45d 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 325c2ae7779b..09343066dfcb 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.  */