X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fregex.c;h=d149d60f39be49a6c974233177129b8a5aa64cf9;hb=f17e4350dcf0c033891e52b30b0c32a4a4fed5e0;hp=aa87d2c15b42f94324ac91784d448e4c80d9adc0;hpb=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

diff --git a/ucw/regex.c b/ucw/regex.c
index aa87d2c1..d149d60f 100644
--- a/ucw/regex.c
+++ b/ucw/regex.c
@@ -8,15 +8,15 @@
  *	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>
 
-#ifdef CONFIG_POSIX_REGEX
+#ifdef CONFIG_UCW_POSIX_REGEX
 
 /* POSIX regular expression library */
 
@@ -104,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 */
 
@@ -208,11 +208,7 @@ rx_subst(regex *r, const char *by, const char *src, char *dest, uns destlen)
 
 /* BSD regular expression library */
 
-#ifdef CONFIG_OWN_BSD_REGEX
-#include "ucw/regex/regex-sh.h"
-#else
 #include <regex.h>
-#endif
 
 #define INITIAL_MEM 1024		/* Initial space allocated for each pattern */
 #define CHAR_SET_SIZE 256		/* How many characters in the character set.  */