diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-09 12:32:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-11-09 12:32:48 +0100 |
| commit | 13cd7170ccadbc596146175c0674956f49aed830 (patch) | |
| tree | ef650a7fd633d354f237aa267a871fce11fe48d3 /regex | |
| parent | 411a6bfeb94e89f4cd4b8daaee96fe1913218a85 (diff) | |
| download | mariadb-git-13cd7170ccadbc596146175c0674956f49aed830.tar.gz | |
WL#5161 : Cross-platform build with CMake
Diffstat (limited to 'regex')
| -rwxr-xr-x | regex/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | regex/regex2.h | 4 |
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] */ |