diff options
Diffstat (limited to 'regex')
| -rwxr-xr-x | regex/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | regex/regcomp.c | 4 | ||||
| -rw-r--r-- | regex/reginit.c | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt index bdec7194e41..a3088c00357 100755 --- a/regex/CMakeLists.txt +++ b/regex/CMakeLists.txt @@ -16,5 +16,10 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys}) -ADD_LIBRARY(regex debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + +SET(REGEX_SOURCES debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c) + +IF(NOT SOURCE_SUBLIBS) + ADD_LIBRARY(regex ${REGEX_SOURCES}) +ENDIF(NOT SOURCE_SUBLIBS) diff --git a/regex/regcomp.c b/regex/regcomp.c index 0a65c5021fb..b203d4941e1 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -1479,8 +1479,8 @@ sopno pos; } { int length=(HERE()-pos-1)*sizeof(sop); - bmove_upp((char *) &p->strip[pos+1]+length, - (char *) &p->strip[pos]+length, + bmove_upp((uchar *) &p->strip[pos+1]+length, + (uchar *) &p->strip[pos]+length, length); } #ifdef OLD_CODE diff --git a/regex/reginit.c b/regex/reginit.c index f0b53e64be3..5980de24030 100644 --- a/regex/reginit.c +++ b/regex/reginit.c @@ -5,7 +5,7 @@ #include <m_string.h> #include "cclass.h" -static bool regex_inited=0; +static my_bool regex_inited=0; void my_regex_init(CHARSET_INFO *cs) { @@ -16,7 +16,7 @@ void my_regex_init(CHARSET_INFO *cs) if (!regex_inited) { regex_inited=1; - bzero((gptr) &count,sizeof(count)); + bzero((uchar*) &count,sizeof(count)); for (i=1 ; i<= 255; i++) { |