X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fregex.c;h=82ccd4575ddb8aa63156b6315787e1a0871f2682;hb=1d9a3e3de04d38b74a35a7f70785452d99afaeca;hp=6ead4648e9f8e270e77c232bd4a62211b67c2403;hpb=804b539f2f9d9af87ffa7036fd2b181fb12d86f1;p=libucw.git

diff --git a/ucw/regex.c b/ucw/regex.c
index 6ead4648..82ccd457 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 */
 
@@ -185,7 +185,7 @@ rx_subst(regex *r, const char *by, const char *src, char *dest, uns destlen)
 	      uns j = *by++ - '0';
 	      if (j < r->real_matches && r->matches[2*j] >= 0)
 		{
-		  char *s = src + r->matches[2*j];
+		  const char *s = src + r->matches[2*j];
 		  uns i = r->matches[2*j+1] - r->matches[2*j];
 		  if (dest + i >= end)
 		    return -1;