summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
Diffstat (limited to 'regex')
-rwxr-xr-xregex/CMakeLists.txt5
-rw-r--r--regex/regex2.h4
2 files changed, 3 insertions, 6 deletions
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt
index 440be4d2f12..f02c5745ef3 100755
--- a/regex/CMakeLists.txt
+++ b/regex/CMakeLists.txt
@@ -17,7 +17,6 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
+USE_ABSOLUTE_FILENAMES(REGEX_SOURCES)
+ADD_LIBRARY(regex ${REGEX_SOURCES})
-IF(NOT SOURCE_SUBLIBS)
- ADD_LIBRARY(regex ${REGEX_SOURCES})
-ENDIF(NOT SOURCE_SUBLIBS)
diff --git a/regex/regex2.h b/regex/regex2.h
index bba54ea2054..2ab32c62da8 100644
--- a/regex/regex2.h
+++ b/regex/regex2.h
@@ -83,9 +83,7 @@ typedef long sopno;
* a string of multi-character elements, and decide the size of the
* vectors at run time.
*/
-#ifdef __WIN__
-typedef unsigned char uch ;
-#endif
+
typedef struct {
uch *ptr; /* -> uch [csetsize] */