WL#5161 : Cross-platform build with CMake

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)

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] */