From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Eric Botcazou <ebotcazou@adacore.com>
Subject: [COMMITTED] ada: Follow-up fix for compilation issue with recent MinGW-w64 versions
Date: Mon, 10 Jul 2023 14:44:31 +0200 [thread overview]
Message-ID: <20230710124431.2263755-1-poulhies@adacore.com> (raw)
From: Eric Botcazou <ebotcazou@adacore.com>
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.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/adaint.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 8522094164e..2a193efc002 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>
--
2.40.0
next reply other threads:[~2023-07-10 12:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 12:44 Marc Poulhiès [this message]
2023-07-11 9:20 ` Eric Botcazou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230710124431.2263755-1-poulhies@adacore.com \
--to=poulhies@adacore.com \
--cc=ebotcazou@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).