diff options
author | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-09-20 03:03:26 +0000 |
commit | 1f457376b478257b88d4a857f5ec1b6155442dd7 (patch) | |
tree | 2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4maixdmu.cpt | |
parent | ac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff) |
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4maixdmu.cpt')
-rw-r--r-- | support/dktools/dk4maixdmu.cpt | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/support/dktools/dk4maixdmu.cpt b/support/dktools/dk4maixdmu.cpt index 2668df1bb6..e1a9ced34a 100644 --- a/support/dktools/dk4maixdmu.cpt +++ b/support/dktools/dk4maixdmu.cpt @@ -2,7 +2,7 @@ copyright owner = Dirk Krause copyright year = 2015-xxxx -license = bsd +SPDX-License-Identifier: BSD-3-Clause @@ -14,17 +14,29 @@ license = bsd */ #ifndef DK4CONF_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4conf.h" +#else +#include <dktools-4/dk4conf.h> +#endif #endif #if DK4_HAVE_INTMAX_T #ifndef DK4TYPES_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4types.h" +#else +#include <dktools-4/dk4types.h> +#endif #endif #ifndef DK4ERROR_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4error.h" +#else +#include <dktools-4/dk4error.h> +#endif #endif @@ -109,6 +121,15 @@ dk4ma_input_wx_dec_uintmax_t( #include "dk4conf.h" +#ifndef DK4USE_H_INCLUDED +#include "dk4use.h" +#endif + +#ifndef DK4_SIZEOF_WXCHAR +#ifndef DK4WXCS_H_INCLUDED +#include "dk4wxcs.h" +#endif +#endif #if (DK4_HAVE_WXWIDGETS) && (defined(__cplusplus)) @@ -117,7 +138,7 @@ dk4ma_input_wx_dec_uintmax_t( #include "dk4maixdmu.h" -#if DK4_ON_WINDOWS +#if DK4_USE_PRAGMA_WARNING_DISABLE #pragma warning (disable:4206) #endif @@ -135,6 +156,12 @@ dk4ma_input_wx_dec_uintmax_t( #include "dk4mai8dmu.h" #endif +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include <assert.h> +#define ASSERT_H_INCLUDED 1 +#endif +#endif int @@ -146,6 +173,10 @@ dk4ma_input_wx_dec_uintmax_t( dk4_er_t *erp ) { +#if DK4_USE_ASSERT + assert(NULL != rp); + assert(NULL != src); +#endif #if DK4_SIZEOF_WXCHAR > 1 return ( dk4ma_input_wc_dec_uintmax_t(rp, src, endptr, atg, erp)); #else |