summaryrefslogtreecommitdiff
path: root/support/dktools/dk4maixdic.cpt
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk4maixdic.cpt
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4maixdic.cpt')
-rw-r--r--support/dktools/dk4maixdic.cpt29
1 files changed, 28 insertions, 1 deletions
diff --git a/support/dktools/dk4maixdic.cpt b/support/dktools/dk4maixdic.cpt
index 961da1f6a1..f9f328babb 100644
--- a/support/dktools/dk4maixdic.cpt
+++ b/support/dktools/dk4maixdic.cpt
@@ -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 <dktools-4/dk4conf.h>
+#endif
#endif
#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
@@ -99,6 +111,11 @@ dk4ma_input_wx_dec_char(
#include "dk4conf.h"
+#ifndef DK4_SIZEOF_WXCHAR
+#ifndef DK4WXCS_H_INCLUDED
+#include "dk4wxcs.h"
+#endif
+#endif
#if (DK4_HAVE_WXWIDGETS) && (defined(__cplusplus))
@@ -117,6 +134,12 @@ dk4ma_input_wx_dec_char(
#include "dk4mai8dic.h"
#endif
+#if DK4_HAVE_ASSERT_H
+#ifndef ASSERT_H_INCLUDED
+#include <assert.h>
+#define ASSERT_H_INCLUDED 1
+#endif
+#endif
int
@@ -128,6 +151,10 @@ dk4ma_input_wx_dec_char(
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_char(rp, src, endptr, atg, erp));
#else