public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Yong <jyong@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4888] libgcc: fix gfortran build on Windows Date: Sun, 25 Dec 2022 01:10:19 +0000 (GMT) [thread overview] Message-ID: <20221225011019.BD8E33858D1E@sourceware.org> (raw) https://gcc.gnu.org/g:339db340af2fdeceeb06b2249330bc103e38691c commit r13-4888-g339db340af2fdeceeb06b2249330bc103e38691c Author: Jonathan Yong <10walls@gmail.com> Date: Sun Dec 25 01:06:20 2022 +0000 libgcc: fix gfortran build on Windows Broken by 9149a5b7e0a66b7b94d5b7db3194a975d18dea2f. CC_NONE is defined by wingdi.h and conflicting with gcc. Committed as obvious. libgcc/: * config/i386/gthr-win32.h: undef CC_NONE Signed-off-by: Jonathan Yong <10walls@gmail.com> Diff: --- libgcc/config/i386/gthr-win32.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 9485dd50bf9..146357fa436 100644 --- a/libgcc/config/i386/gthr-win32.h +++ b/libgcc/config/i386/gthr-win32.h @@ -93,8 +93,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> -/* Now undef the windows BOOL. */ +/* Now undef the windows BOOL and CC_NONE */ #undef BOOL +#undef CC_NONE /* Key structure for maintaining thread specific storage */ static DWORD __gthread_objc_data_tls = TLS_OUT_OF_INDEXES; @@ -604,6 +605,7 @@ __gthread_cond_timedwait (__gthread_cond_t *__cond, __gthread_mutex_t *__mutex, #define WIN32_LEAN_AND_MEAN #include <windows.h> +#undef CC_NONE __GTHREAD_WIN32_INLINE int __gthread_detach (__gthread_t __thr)
reply other threads:[~2022-12-25 1:10 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20221225011019.BD8E33858D1E@sourceware.org \ --to=jyong@gcc.gnu.org \ --cc=gcc-cvs@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: linkBe 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).