From 1f457376b478257b88d4a857f5ec1b6155442dd7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 20 Sep 2020 03:03:26 +0000 Subject: CTAN sync 202009200303 --- support/dktools/dk4maiwduc.ctr | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'support/dktools/dk4maiwduc.ctr') diff --git a/support/dktools/dk4maiwduc.ctr b/support/dktools/dk4maiwduc.ctr index cd2e0803d9..188bcc86da 100644 --- a/support/dktools/dk4maiwduc.ctr +++ b/support/dktools/dk4maiwduc.ctr @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2015-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause @@ -14,15 +14,27 @@ license = bsd */ #ifndef DK4CONF_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4conf.h" +#else +#include +#endif #endif #ifndef DK4TYPES_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4types.h" +#else +#include +#endif #endif #ifndef DK4ERROR_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4error.h" +#else +#include +#endif #endif @@ -69,6 +81,15 @@ dk4ma_input_wc_dec_uchar( %% module +#include "dk4conf.h" + +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include +#define ASSERT_H_INCLUDED 1 +#endif +#endif + #include "dk4maiwduc.h" #include "dk4maiwddu.h" #include "dk4numco.h" @@ -86,7 +107,10 @@ dk4ma_input_wc_dec_uchar( { dk4_um_t res; int back = 0; - +#if DK4_USE_ASSERT + assert(NULL != rp); + assert(NULL != src); +#endif if (0 != dk4ma_input_wc_dec_dk4_um_t(&res, src, endptr, atg, erp)) { if (((dk4_um_t)(UCHAR_MAX)) >= res) { *rp = (unsigned char)res; -- cgit v1.2.3