Bruno Haible <br...@clisp.org> writes:
> Please consider the boolean value of these expressions.
> - Unix: I wish the signature check to be enabled.
> - Cygwin: likewise
> - 64-bit Windows: here it can be enabled as well.
> - 32-bit Windows: here not. This is the case we need to exclude.
Oops, that is embarrassing...
Fixed with your recommendation.
Collin
>From dd8057e53a8b4e710528d35948ca07220292b931 Mon Sep 17 00:00:00 2001
From: Collin Funk <collin.fu...@gmail.com>
Date: Mon, 6 Jan 2025 18:28:35 -0800
Subject: [PATCH] servent tests: Fix mistake in previous commit.
Reported by Bruno Haible.
* tests/test-servent.c (getservbyname, getservbyport)
[_WIN32 && !_WIN64 && !__CYGWIN__]: Disable signature check.
---
ChangeLog | 5 +++++
tests/test-servent.c | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 601407cce3..2acacb69a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2025-01-06 Collin Funk <collin.fu...@gmail.com>
+ servent tests: Fix mistake in previous commit.
+ Reported by Bruno Haible.
+ * tests/test-servent.c (getservbyname, getservbyport)
+ [_WIN32 && !_WIN64 && !__CYGWIN__]: Disable signature check.
+
servent tests: Fix failure on 32-bit native Windows.
* tests/test-servent.c (getservbyname, getservbyport)
[_WIN64 && !__CYGWIN__]: Disable signature check.
diff --git a/tests/test-servent.c b/tests/test-servent.c
index 0e774bdfcc..3715944ca2 100644
--- a/tests/test-servent.c
+++ b/tests/test-servent.c
@@ -23,7 +23,7 @@
#include "signature.h"
-#if defined _WIN64 && !defined __CYGWIN__
+#if !(defined _WIN32 && !defined _WIN64 && !defined __CYGWIN__)
/* On 32-bit native Windows, these two functions may have the __stdcall calling
convention. But the SIGNATURE_CHECK works only for functions with __cdecl
calling convention. */
--
2.47.1
