From 339db340af2fdeceeb06b2249330bc103e38691c Mon Sep 17 00:00:00 2001 From: Jonathan Yong <10walls@gmail.com> Date: Sun, 25 Dec 2022 01:06:20 +0000 Subject: [PATCH] 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> --- 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 9485dd50bf90..146357fa436c 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 -/* 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 +#undef CC_NONE __GTHREAD_WIN32_INLINE int __gthread_detach (__gthread_t __thr) -- 2.47.2