]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ada: Follow-up fix for compilation issue with recent MinGW-w64 versions
authorEric Botcazou <ebotcazou@adacore.com>
Fri, 30 Jun 2023 15:14:44 +0000 (17:14 +0200)
committerMarc Poulhiès <poulhies@adacore.com>
Mon, 10 Jul 2023 12:41:40 +0000 (14:41 +0200)
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.

gcc/ada/adaint.c

index 8522094164e07f92afe345a49b35967237d65b5e..2a193efc0020e550e9be6d411cd3faed589915ce 100644 (file)
@@ -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>