From 2ee1686dcccaf06667fb98eea62deb72979ac8a1 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 27 Oct 2024 18:46:39 +0800 Subject: [PATCH 1/2] Fix name conflicts with `small` macro from `rpcndr` --- src/qsieve.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qsieve.h b/src/qsieve.h index 1797653a9d..d7e1655aa5 100644 --- a/src/qsieve.h +++ b/src/qsieve.h @@ -24,6 +24,9 @@ extern "C" { #endif +// rpcndr.h (included via windows.h) defines a `small` macro, which leads to conflicts +#undef small + #define QS_DEBUG 0 /* level of debug information printed, 0 = none */ #define BITS_ADJUST 25 /* add to sieve entries to compensate approximations */ From 97ebad5cb8a6dd387b7ba479c5c36392345a65d4 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 27 Oct 2024 20:00:22 +0800 Subject: [PATCH 2/2] Update comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Albin Ahlbäck --- src/qsieve.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qsieve.h b/src/qsieve.h index d7e1655aa5..68ab9cd52d 100644 --- a/src/qsieve.h +++ b/src/qsieve.h @@ -24,7 +24,7 @@ extern "C" { #endif -// rpcndr.h (included via windows.h) defines a `small` macro, which leads to conflicts +/* Windows systems may define `small` macro, which leads to conflicts */ #undef small #define QS_DEBUG 0 /* level of debug information printed, 0 = none */