Added SILC_STR_STRING and SILC_STR_STRING_APPEND and support for

[crypto.git] / includes / silc.h.in

diff --git a/includes/silc.h.in b/includes/silc.h.in
index 14f63c1cdc2f9fe7744e84cc444b876dd87d0617..669c1343c375d0bcdc4352a20f12be5acfb4f528 100644 (file)
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -195,14 +195,6 @@ extern "C" {
 #include <limits.h>
 #endif
 
-#ifndef HAVE_REGEX_H
-#if defined(HAVE_SILCDEFS_H)
-#include "regexpr.h"
-#endif /* HAVE_SILCDEFS_H */
-#else
-#include <regex.h>
-#endif
-
 #ifdef SILC_HAVE_PTHREAD
 #include <pthread.h>
 #endif
@@ -263,6 +255,7 @@ extern "C" {
 #include "silcthread.h"
 #include "silcschedule.h"
 #include "silclog.h"
+#include "silcfileutil.h"
 #include "silcbuffer.h"
 #include "silcbuffmt.h"
 #include "silcasync.h"
@@ -285,12 +278,12 @@ extern "C" {
 #endif /* SILC_DIST_SSH */
 
 /* More SILC util library includes */
+#include "silcregex.h"
 #include "silcenv.h"
 #include "silcdll.h"
 #include "silchashtable.h"
 #include "silcstream.h"
 #include "silcnet.h"
-#include "silcfileutil.h"
 #include "silcbase64.h"
 #include "silcstrutil.h"
 #include "silcutf8.h"