From 02807aab4331b82bf8a924f9e17e673ad0846f75 Mon Sep 17 00:00:00 2001 From: yuyi Date: Sat, 2 May 2020 23:22:34 +0800 Subject: [PATCH] interpolation: fix error on windows_gcc --- .github/workflows/ci.yml | 3 +++ vlib/v/gen/cheaders.v | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ce3b0694f..661c238e57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -243,6 +243,9 @@ jobs: run: | gcc --version .\make.bat -gcc + - name: Fixed tests + run: | + .\v.exe test-fixed # - name: Test # run: | # .\v.exe -silent test-compiler diff --git a/vlib/v/gen/cheaders.v b/vlib/v/gen/cheaders.v index a728ed6b86..74aa9fb244 100644 --- a/vlib/v/gen/cheaders.v +++ b/vlib/v/gen/cheaders.v @@ -203,6 +203,21 @@ extern wchar_t **_wenviron; #define macro_f32_gt(a, b) (a > b) #define macro_f32_ge(a, b) (a >= b) +#if defined(__MINGW32__) || defined(__MINGW64__) +#undef PRId64 +#undef PRIi64 +#undef PRIo64 +#undef PRIu64 +#undef PRIx64 +#undef PRIX64 +#define PRId64 "lld" +#define PRIi64 "lli" +#define PRIo64 "llo" +#define PRIu64 "llu" +#define PRIx64 "llx" +#define PRIX64 "llX" +#endif + //================================== GLOBALS =================================*/ byte g_str_buf[1024]; int load_so(byteptr);