From: Pavel Charvat <pchar@ucw.cz>
Date: Tue, 27 Jan 2009 23:52:06 +0000 (+0100)
Subject: Fixed accidentally modified files during the last merge.
X-Git-Tag: holmes-import~118^2~5
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=2432b8ac85cd0bce9a0dc5d457ba38be360e64f7;p=libucw.git

Fixed accidentally modified files during the last merge.
---

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 58f7e594..f042800f 100644
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -19,11 +19,6 @@ Set("CONFIG_LARGE_FILES");
 # Use shared libraries
 UnSet("CONFIG_SHARED");
 
-# If your system doesn't contain GNU libc 2.3 or newer, it's recommended to let Sherlock
-# use its own regex library (a copy of the glibc one), because the default regex library
-# is likely to be crappy.
-Set("CONFIG_OWN_REGEX");
-
 # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
 # of GNU libc's getopt. This should not be necessary on GNU libc.
 UnSet("CONFIG_OWN_GETOPT");
diff --git a/ucw/regex.c b/ucw/regex.c
index f74f33e1..6ead4648 100644
--- a/ucw/regex.c
+++ b/ucw/regex.c
@@ -16,15 +16,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined(CONFIG_OWN_REGEX) || defined(CONFIG_POSIX_REGEX)
+#ifdef CONFIG_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;