summaryrefslogtreecommitdiff
path: root/support/dktools/dk4strmr.ctr
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/dk4strmr.ctr
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk4strmr.ctr')
-rw-r--r--support/dktools/dk4strmr.ctr40
1 files changed, 39 insertions, 1 deletions
diff --git a/support/dktools/dk4strmr.ctr b/support/dktools/dk4strmr.ctr
index 2cdba61daf..20a43072a6 100644
--- a/support/dktools/dk4strmr.ctr
+++ b/support/dktools/dk4strmr.ctr
@@ -2,7 +2,7 @@
copyright owner = Dirk Krause
copyright year = 2015-xxxx
-license = bsd
+SPDX-License-Identifier: BSD-3-Clause
%% header
@@ -12,31 +12,59 @@ 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
#ifndef DK4STRM_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
#include "dk4strm.h"
+#else
+#include <dktools-4/dk4strm.h>
+#endif
#endif
#ifndef DK4STRMF_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
#include "dk4strmf.h"
+#else
+#include <dktools-4/dk4strmf.h>
+#endif
#endif
#ifndef DK4STRMG_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
#include "dk4strmg.h"
+#else
+#include <dktools-4/dk4strmg.h>
+#endif
#endif
#ifndef DK4STRMB_H_INCLUDED
+#if DK4_BUILDING_DKTOOLS4
#include "dk4strmb.h"
+#else
+#include <dktools-4/dk4strmb.h>
+#endif
#endif
@@ -79,6 +107,13 @@ dk4stream_open_file_reader(const dkChar *filename, dk4_er_t *erp);
#endif
#endif
+#if DK4_HAVE_ASSERT_H
+#ifndef ASSERT_H_INCLUDED
+#include <assert.h>
+#define ASSERT_H_INCLUDED 1
+#endif
+#endif
+
#include "dk4strmr.h"
#ifndef DK4FD_H_INCLUDED
@@ -145,6 +180,9 @@ dk4stream_open_file_reader(const dkChar *filename, dk4_er_t *erp)
int fd = -1; /* File descriptor */
#endif
$? "+ dk4stream_open_file_reader \"%!ds\"", filename
+#if DK4_USE_ASSERT
+ assert(NULL != filename);
+#endif
if (NULL != filename) {
p1 = dk4path_get_suffix(filename, erp);
if (NULL != p1) { $? ". file name suffix \"%!ds\"", p1