Added SILC regular expression API. Added new regex error values.

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

diff --git a/includes/silc.h.in b/includes/silc.h.in
index cb2f0b7b04454cda92da963dfe2c36607af5a9ec..88fa7d16e449b126ff716a788c84be55b4b985a1 100644 (file)
--- a/includes/silc.h.in
+++ b/includes/silc.h.in
@@ -158,14 +158,6 @@ extern "C" {
 #include <grp.h>
 #endif
 
-#if defined(HAVE_GETOPT_H) && defined(HAVE_GETOPT)
-#include <getopt.h>
-#else
-#if defined(HAVE_SILCDEFS_H)
-#include "getopti.h"
-#endif /* HAVE_SILCDEFS_H */
-#endif
-
 #ifdef SOCKS5
 #include "socks.h"
 #endif
@@ -203,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
@@ -246,12 +230,15 @@ extern "C" {
 #endif                         /* !SILC_WIN32 */
 
 /* Include generic SILC type definitions */
+#include "silcerrno.h"
 #include "silctypes.h"
+#include "silcbitops.h"
 #include "silcmutex.h"
 #include "silcatomic.h"
 #include "silcversion.h"
 
 /* SILC util library includes */
+#include "silcgetopt.h"
 #include "silclist.h"
 #include "silcstack.h"
 #include "silcmemory.h"
@@ -290,6 +277,7 @@ extern "C" {
 #endif /* SILC_DIST_SSH */
 
 /* More SILC util library includes */
+#include "silcregex.h"
 #include "silcenv.h"
 #include "silcdll.h"
 #include "silchashtable.h"