public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-4888] libgcc: fix gfortran build on Windows
@ 2022-12-25 1:10 Jonathan Yong
0 siblings, 0 replies; only message in thread
From: Jonathan Yong @ 2022-12-25 1:10 UTC (permalink / raw)
To: gcc-cvs
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)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-25 1:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-25 1:10 [gcc r13-4888] libgcc: fix gfortran build on Windows Jonathan Yong
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).