From 9dd508a3c3f71d0cfff68634be6603466a9e16d0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 6 Jan 2026 12:55:08 +0900 Subject: Drop support for Watcom compiler, which is not c++17 compliant Signed-off-by: Michele Calgaro --- akregator/src/mk4storage/metakit/README | 2 +- akregator/src/mk4storage/metakit/src/header.h | 2 -- akregator/src/mk4storage/metakit/src/std.cpp | 2 +- akregator/src/mk4storage/metakit/src/string.cpp | 2 +- akregator/src/mk4storage/metakit/src/univ.cpp | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README index 5538acc0..ed85141f 100644 --- a/akregator/src/mk4storage/metakit/README +++ b/akregator/src/mk4storage/metakit/README @@ -84,7 +84,7 @@ WINDOWS There is a "win/" directory which contains subdirectories for a number of compiler systems. Metakit has been built with many different compilers - in the past (Microsoft, Watcom, Symantec, Optima), + in the past (Microsoft, Symantec, Optima), only a few are maintained (there are 12 configurations for MSVC6 alone!). The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects diff --git a/akregator/src/mk4storage/metakit/src/header.h b/akregator/src/mk4storage/metakit/src/header.h index 4f62551f..ba8d0e59 100644 --- a/akregator/src/mk4storage/metakit/src/header.h +++ b/akregator/src/mk4storage/metakit/src/header.h @@ -97,8 +97,6 @@ #include "msvc.h" #elif defined (__SC__) // Symantec C++ #define q4_SYMC 1 -#elif defined (__WATCOMC__) // Watcom C++ -#define q4_WATC 1 #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/akregator/src/mk4storage/metakit/src/std.cpp b/akregator/src/mk4storage/metakit/src/std.cpp index 135fe776..aa0e61b1 100644 --- a/akregator/src/mk4storage/metakit/src/std.cpp +++ b/akregator/src/mk4storage/metakit/src/std.cpp @@ -29,7 +29,7 @@ using namespace std; ///////////////////////////////////////////////////////////////////////////// -#if !q4_MSVC && !q4_WATC +#if !q4_MSVC // MS C/C++ has this handy stricmp: a case-insensitive version of strcmp // This version only works with 7-bit ASCII characters 0x00 through 0x7F diff --git a/akregator/src/mk4storage/metakit/src/string.cpp b/akregator/src/mk4storage/metakit/src/string.cpp index e5d140ab..7db4ec21 100644 --- a/akregator/src/mk4storage/metakit/src/string.cpp +++ b/akregator/src/mk4storage/metakit/src/string.cpp @@ -34,7 +34,7 @@ ///////////////////////////////////////////////////////////////////////////// -#if q4_MSVC || q4_WATC +#if q4_MSVC #define strcasecmp stricmp #elif q4_WINCE diff --git a/akregator/src/mk4storage/metakit/src/univ.cpp b/akregator/src/mk4storage/metakit/src/univ.cpp index 08a4ba1a..8ce2aab0 100644 --- a/akregator/src/mk4storage/metakit/src/univ.cpp +++ b/akregator/src/mk4storage/metakit/src/univ.cpp @@ -21,7 +21,7 @@ #if q4_UNIX || __MINGW32__ #define _strdup strdup -#elif !q4_MSVC && !q4_WATC +#elif !q4_MSVC static char* _strdup(const char* p) { -- cgit v1.2.3