On 2022-12-24 13:50, i.nix...@autistici.org wrote:
On 2022-12-24 05:58, NightStrike wrote:I think this might have broken fortran. I'm assuming because the backtrace includes gthr.h, and I just did a git pull: In file included from /tmp/rtmingw/mingw/include/windows.h:71, from ../libgcc/gthr-default.h:606, from ../../../libgfortran/../libgcc/gthr.h:148, from ../../../libgfortran/io/io.h:33, from ../../../libgfortran/runtime/error.c:27: ../../../libgfortran/io/io.h:298:24: error: expected identifier before numeric constant 298 | { CC_LIST, CC_FORTRAN, CC_NONE, | ^~~~~~~yes, you are right! this is because the `CC_NONE` was previously defined in `wingdi.h` as `#define CC_NONE 0` thinking...
fixed and tested. Jonathan Yong, could you please apply the attached patch too? kings regards!
diff --git a/libgcc/config/i386/gthr-win32.h b/libgcc/config/i386/gthr-win32.h index 9485dd50bf9..2b5b782c894 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;
