From: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri, 30 Jun 2023 15:14:44 +0000 (+0200)
Subject: ada: Follow-up fix for compilation issue with recent MinGW-w64 versions
X-Git-Tag: basepoints/gcc-15~7724
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de9362acda4acd1462ca04c056f89f542c35ff4;p=thirdparty%2Fgcc.git

ada: Follow-up fix for compilation issue with recent MinGW-w64 versions

It turns out that adaint.c includes other Windows header files than just
windows.h, so defining WIN32_LEAN_AND_MEAN is not sufficient for it.

gcc/ada/

	* adaint.c [_WIN32]: Undefine 'abort' macro.
---

diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 8522094164e0..2a193efc0020 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -227,6 +227,9 @@ UINT __gnat_current_ccs_encoding;
 
 #elif defined (_WIN32)
 
+/* Cannot redefine abort here.  */
+#undef abort
+
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <accctrl.h>