diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71c962f1..b11e75a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,8 @@ jobs: include: - { os: ubuntu-20.04, use_extra: true } - { os: ubuntu-22.04, use_extra: true, use_wine: true } - # GitHub ubuntu-24.04 is BETA; currently i386 programs can abort with "The futex facility returned an unexpected error code" + # GitHub ubuntu-24.04 is BETA; BUG: currently i386 programs can abort with "The futex facility returned an unexpected error code" + # THIS IS A KNOWN ISSUE: https://github.com/actions/runner-images/issues/9848 - { os: ubuntu-24.04 } # TODO later: enable extra+wine once the GitHub VM is fixed steps: - name: Install extra 32-bit and MinGW packages diff --git a/CMakeLists.txt b/CMakeLists.txt index c9f9a6d8..b53c47a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,6 +213,8 @@ if(MSVC_FRONTEND OR WIN32 OR MINGW OR CYGWIN) add_definitions(-D_CRT_NONSTDC_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_definitions(-D_SCL_SECURE_NO_DEPRECATE) + add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-DWIN32_LEAN_AND_MEAN) add_definitions(-D__USE_MINGW_ANSI_STDIO) endif() diff --git a/src/util/system_defs.h b/src/util/system_defs.h index 5a16a59d..2b9278a7 100644 --- a/src/util/system_defs.h +++ b/src/util/system_defs.h @@ -67,6 +67,12 @@ #if !defined(_CRT_SECURE_NO_WARNINGS) #define _CRT_SECURE_NO_WARNINGS 1 #endif +#if !defined(_SCL_SECURE_NO_DEPRECATE) +#define _SCL_SECURE_NO_DEPRECATE 1 +#endif +#if !defined(_SCL_SECURE_NO_WARNINGS) +#define _SCL_SECURE_NO_WARNINGS 1 +#endif #endif // _WIN32 /* vim:set ts=4 sw=4 et: */