aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2023-06-30 17:14:44 +0200
committerMarc Poulhiès <poulhies@adacore.com>2023-07-10 14:41:40 +0200
commit6de9362acda4acd1462ca04c056f89f542c35ff4 (patch)
tree60bd544f8a66d2f211e8ea138f816868cb2abf62 /gcc/ada
parentf068a49d95001971e39ab68835e525bb78c65b80 (diff)
downloadgcc-6de9362acda4acd1462ca04c056f89f542c35ff4.zip
gcc-6de9362acda4acd1462ca04c056f89f542c35ff4.tar.gz
gcc-6de9362acda4acd1462ca04c056f89f542c35ff4.tar.bz2
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.
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/adaint.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 8522094..2a193ef 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>