Heap: Interface cleanup

[libucw.git] / ucw / regex.c

diff --git a/ucw/regex.c b/ucw/regex.c
index f74f33e1d4e78141557f5df7948937ed62d88d55..d149d60f39be49a6c974233177129b8a5aa64cf9 100644 (file)
--- a/ucw/regex.c
+++ b/ucw/regex.c
@@ -8,23 +8,19 @@
  *     of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/chartype.h"
-#include "ucw/hashfunc.h"
-#include "ucw/regex.h"
+#include <ucw/lib.h>
+#include <ucw/chartype.h>
+#include <ucw/hashfunc.h>
+#include <ucw/regex.h>
 
 #include <stdio.h>
 #include <string.h>
 
-#if defined(CONFIG_OWN_REGEX) || defined(CONFIG_POSIX_REGEX)
+#ifdef CONFIG_UCW_POSIX_REGEX
 
 /* POSIX regular expression library */
 
-#ifdef CONFIG_OWN_REGEX
-#include "lib/regex/regex-sh.h"
-#else
 #include <regex.h>
-#endif
 
 struct regex {
   regex_t rx;
@@ -108,7 +104,7 @@ rx_subst(regex *r, const char *by, const char *src, char *dest, uns destlen)
   return 1;
 }
 
-#elif defined(CONFIG_PCRE)
+#elif defined(CONFIG_UCW_PCRE)
 
 /* PCRE library */