Fix compiler warnings

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@883 2f5784b3-3f2a-0410-8824-cb99058d5e15

3 files changed, 14 insertions, 7 deletions

diff --git a/RunTest.bat b/RunTest.bat
index 2d3b68a..9fc33c8 100644
--- a/RunTest.bat
+++ b/RunTest.bat
@@ -231,7 +231,6 @@ if [%1]==[11] (
 )

 if errorlevel 1 (

   echo.          failed comparison: fc /n "%srcdir%\testdata\%testoutput%" "%2%bits%\%testoutput%"

-  set failed="yes"

   if [%1]==[2] (

     echo.

     echo ** Test 2 requires a lot of stack. PCRE can be configured to

@@ -242,13 +241,14 @@ if errorlevel 1 (
     echo.

 )

   if [%1]==[3] (

-    set failed="no"

     echo.

     echo ** Test 3 failure usually means french locale is not

     echo ** available on the system, rather than a bug or problem with PCRE.

     echo.

+    goto :eof

 )

 

+  set failed="yes"

   goto :eof

 )

 

@@ -370,6 +370,7 @@ goto :eof
   echo Test 14 Skipped when running 16-bit tests.

   goto :eof

 )

+  copy /Y "%srcdir%\testdata\saved16" testsaved16

   call :runsub 14 testout "Specials for the basic 8-bit library" -q

   call :runsub 14 testoutstudy "Test with Study Override" -q -s

   if %jit% EQU 1 call :runsub 14 testoutjit "Test with JIT Override" -q -s+

diff --git a/pcre_get.c b/pcre_get.c
index 6c61b02..3d9904e 100644
--- a/pcre_get.c
+++ b/pcre_get.c
@@ -236,18 +236,21 @@ get_first_set(const pcre16 *code, PCRE_SPTR16 stringname, int *ovector)
 {
 const REAL_PCRE *re = (const REAL_PCRE *)code;
 int entrysize;
-pcre_uchar *first, *last;
 pcre_uchar *entry;
 #ifdef COMPILE_PCRE8
+char *first, *last;
+#else
+PCRE_UCHAR16 *first, *last;
+#endif
+
+#ifdef COMPILE_PCRE8
 if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
   return pcre_get_stringnumber(code, stringname);
-entrysize = pcre_get_stringtable_entries(code, stringname,
-  (char **)&first, (char **)&last);
+entrysize = pcre_get_stringtable_entries(code, stringname, &first, &last);
 #else
 if ((re->options & PCRE_DUPNAMES) == 0 && (re->flags & PCRE_JCHANGED) == 0)
   return pcre16_get_stringnumber(code, stringname);
-entrysize = pcre16_get_stringtable_entries(code, stringname,
-  (PCRE_UCHAR16 **)&first, (PCRE_UCHAR16 **)&last);
+entrysize = pcre16_get_stringtable_entries(code, stringname, &first, &last);
 #endif
 if (entrysize <= 0) return entrysize;
 for (entry = (pcre_uchar *)first; entry <= (pcre_uchar *)last; entry += entrysize)
diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c
index c693fe3..e53cba4 100644
--- a/pcre_jit_compile.c
+++ b/pcre_jit_compile.c
@@ -352,6 +352,9 @@ enum {
   frame_setstrbegin = -1
 };
 
+/* Undefine sljit macros. */
+#undef CMP
+
 /* Used for accessing the elements of the stack. */
 #define STACK(i)      ((-(i) - 1) * (int)sizeof(sljit_w))