diff options
-rw-r--r-- | src/driver/horizon_sequence.cc | 1 | ||||
-rw-r--r-- | src/jtutil/miscstr.c | 6 | ||||
-rw-r--r-- | src/jtutil/util.hh | 32 |
3 files changed, 8 insertions, 31 deletions
diff --git a/src/driver/horizon_sequence.cc b/src/driver/horizon_sequence.cc index 0dde7bc..bc261e6 100644 --- a/src/driver/horizon_sequence.cc +++ b/src/driver/horizon_sequence.cc @@ -14,6 +14,7 @@ #include <assert.h> #include "../include/stdc.h" +#include "../jtutil/misc.h" #include "../jtutil/util.hh" #include "horizon_sequence.hh" diff --git a/src/jtutil/miscstr.c b/src/jtutil/miscstr.c index 6553b55..97aefeb 100644 --- a/src/jtutil/miscstr.c +++ b/src/jtutil/miscstr.c @@ -6,11 +6,7 @@ #include "../include/stdc.h" -/* - * exceptionally, this (C++) header file is safe to #include from C, - * and contains a prototype for AHFinderDirect_Strlcat() . - */ -#include "util.hh" +#include "misc.h" /******************************************************************************/ diff --git a/src/jtutil/util.hh b/src/jtutil/util.hh index ddba0d7..80ca2dc 100644 --- a/src/jtutil/util.hh +++ b/src/jtutil/util.hh @@ -1,29 +1,10 @@ -/* util.hh -- stuff for my C++ utility library */ -/* $Header$ */ - -/* - * prerequisites: - * <stdlib.h> or <string.h> or <stdio.h> // size_t - * "stdc.h" - * - * This is mainly a C++ header file, but exceptionally (until Tom puts - * my latest patches into the Cactus flesh :), it's safe to #include - * from C code, to provide a prototype for AHFinderDirect_Strlcat(). - * Thus we use C comments here. - */ - -/* - * misc string functions (in C, not C++) - */ -#ifdef __cplusplus -extern "C" -#endif -size_t AHFinderDirect_Strlcat(char* dst, const char* src, size_t dst_size); +// $Header$ + +// +// prerequisites: +// "stdc.h" +// -/* - * the rest of this file is C++ only - */ -#ifdef __cplusplus namespace jtutil { @@ -223,4 +204,3 @@ public: //****************************************************************************** } // namespace jtutil -#endif /* __cplusplus */ |