Commit e06fe98769 for openssl.org
commit e06fe987699b23984bee7e738a3f393b05359af0
Author: Bob Beck <beck@openssl.org>
Date: Wed Jun 17 16:58:11 2026 -0600
Drop Watcom C compiler support.
The only Watcom-specific code in the tree was a <tchar.h> _vsntprintf
mapping in crypto/cryptlib.c. There is no Watcom entry in Configurations/,
no CI job builds with Watcom, and the tree has had no other Watcom-aware
code in many years. The _vsntprintf symbol is supplied by <tchar.h>
on every supported Windows toolchain (MSVC, MinGW), so the conditional
fallback is dead.
Reviewed-by: Milan Broz <mbroz@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Neil Horman <nhorman@openssl.org>
MergeDate: Fri Jul 10 11:47:15 2026
(Merged from https://github.com/openssl/openssl/pull/31677)
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index d62ebfae0b..07b244cb35 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -15,13 +15,6 @@
#if defined(_WIN32) && !defined(OPENSSL_SYS_UEFI)
#include <tchar.h>
#include <signal.h>
-#ifdef __WATCOMC__
-#if defined(_UNICODE) || defined(__UNICODE__)
-#define _vsntprintf _vsnwprintf
-#else
-#define _vsntprintf _vsnprintf
-#endif
-#endif
#ifdef _MSC_VER
#define alloca _alloca
#endif