From 7101f6e6894c9374e567e04b10da59f53744dde6 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 18 Nov 2026 13:23:29 -0500 Subject: [PATCH 1/3] Fix the Windows build: drop COM's interface macro windows.h defines interface as struct, which breaks lexbor parameters named interface. Include it lean first and undef the macro. --- native/buzz_shim.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/native/buzz_shim.c b/native/buzz_shim.c index 3fa2149..d59c9c5 100644 --- a/native/buzz_shim.c +++ b/native/buzz_shim.c @@ -4,6 +4,15 @@ #include #include +/* windows.h pulls in COM's `#define interface struct`, which breaks lexbor's + * parameters named interface. Include it first, lean, and drop the macro; + * the include guard makes lexbor's own #include a no-op. */ +#ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN +#include +#undef interface +#endif + #include "lexbor_single.h" #include "buzz_shim.h" From 5390a99a7ef4c2e0f4b4f9c967d8f52aebe33ad8 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 18 Nov 2026 13:30:41 -0500 Subject: [PATCH 2/3] Install lz4 for the Windows static link jolt build links -llz4 when the binary carries a static native archive. --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 356b2cc..6b5a5be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,6 +88,8 @@ jobs: mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-ntldd mingw-w64-ucrt-x86_64-zlib + # jolt build links lz4 statically once a static native is in play + mingw-w64-ucrt-x86_64-lz4 - name: Install jolt's libraries if: runner.os == 'Linux' From 0d13d4805de2d0022ed432c6f1410e7cd85f31a4 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 18 Nov 2026 13:32:37 -0500 Subject: [PATCH 3/3] Move the lz4 note out of the MSYS2 package list --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b5a5be..0da303e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,12 +83,12 @@ jobs: with: msystem: UCRT64 path-type: inherit + # lz4: jolt build links it statically once a static native is in play install: >- curl unzip zip perl mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-ntldd mingw-w64-ucrt-x86_64-zlib - # jolt build links lz4 statically once a static native is in play mingw-w64-ucrt-x86_64-lz4 - name: Install jolt's libraries