diff options
| author | Jonathan Yong <10walls@gmail.com> | 2022-12-25 01:06:20 +0000 |
|---|---|---|
| committer | Jonathan Yong <10walls@gmail.com> | 2022-12-25 01:09:15 +0000 |
| commit | 339db340af2fdeceeb06b2249330bc103e38691c (patch) | |
| tree | 92337798254574c89da163470b550cf59b51bf90 | |
| parent | 843c4d2fb4c3ca06566f9779af1a5ba0bdd72c50 (diff) | |
| download | gcc-339db340af2fdeceeb06b2249330bc103e38691c.zip gcc-339db340af2fdeceeb06b2249330bc103e38691c.tar.gz gcc-339db340af2fdeceeb06b2249330bc103e38691c.tar.bz2 | |
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>
| -rw-r--r-- | libgcc/config/i386/gthr-win32.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 9485dd5..146357f 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) |