From b51560b9ffc9494dc04b2cad927cb69ab9087d48 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Oct 2022 09:43:50 +0000 Subject: winidn: drop WANT_IDN_PROTOTYPES `WANT_IDN_PROTOTYPES` was necessary to avoid using a header that came via an optional package. MS stopped distributing this package some years ago and the winidn definitions are part of standard headers (via `windows.h`) since Vista. Auto-detect Vista inside `lib/idn_win32.c` and enable the manual definitions if building for an older Windows. This allows to delete this manual knob from all build-systems. Also drop the `_SAL_VERSION` sub-case: Our manual definitions are now only enabled with old systems. We assume that code analysis is not run on such systems, allowing us to delete the SAL-friendly flavour of these. Reviewed-by: Jay Satiro Closes #9793 --- winbuild/MakefileBuild.vc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'winbuild') diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 727ef0850..e80bbc749 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -338,7 +338,7 @@ USE_IDN = true !ENDIF !IF "$(USE_IDN)"=="true" -IDN_CFLAGS = $(IDN_CFLAGS) /DUSE_WIN32_IDN /DWANT_IDN_PROTOTYPES +IDN_CFLAGS = $(IDN_CFLAGS) /DUSE_WIN32_IDN WIN_LIBS = $(WIN_LIBS) Normaliz.lib !ENDIF -- cgit v1.2.1