diff options
Diffstat (limited to 'support/dktools/dk4mema.ctr')
-rw-r--r-- | support/dktools/dk4mema.ctr | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/support/dktools/dk4mema.ctr b/support/dktools/dk4mema.ctr index dad2c6eaf5..73bd569bd1 100644 --- a/support/dktools/dk4mema.ctr +++ b/support/dktools/dk4mema.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 <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 DK4APP_H_INCLUDED +#if DK4_BUILDING_DKTOOLS4 #include "dk4app.h" +#else +#include <dktools-4/dk4app.h> +#endif #endif @@ -58,11 +70,19 @@ dk4mem_calloc_app(size_t elsize, size_t nelem, dk4_app_t *app); %% module +#include "dk4conf.h" #include "dk4mema.h" #include "dk4mem.h" #include "dk4maodd.h" #include "dk4const.h" +#if DK4_HAVE_ASSERT_H +#ifndef ASSERT_H_INCLUDED +#include <assert.h> +#define ASSERT_H_INCLUDED 1 +#endif +#endif + void * dk4mem_calloc_app(size_t elsize, size_t nelem, dk4_app_t *app) @@ -73,6 +93,10 @@ dk4mem_calloc_app(size_t elsize, size_t nelem, dk4_app_t *app) dk4_er_t er; int res; +#if DK4_USE_ASSERT + assert(0 < elsize); + assert(0 < nelem); +#endif dk4error_init(&er); back = dk4mem_calloc(elsize, nelem, &er); if (NULL == back) { |