.

[gnulib.git] / lib / rx.c

diff --git a/lib/rx.c b/lib/rx.c
index 54ae3b7..453aeed 100644 (file)
--- a/lib/rx.c
+++ b/lib/rx.c
@@ -30,6 +30,9 @@ write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA
 #define        _GNU_SOURCE
 #endif
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 \f
 const char *rx_version_string = "GNU Rx version 0.07.2";
 
@@ -115,9 +118,7 @@ char *alloca ();
 
 #ifndef emacs
 
-#ifdef SYNTAX_TABLE
-extern char *re_syntax_table;
-#else /* not SYNTAX_TABLE */
+#ifndef SYNTAX
 
 RX_DECL char re_syntax_table[CHAR_SET_SIZE];
 
@@ -150,7 +151,7 @@ init_syntax_once ()
 
    done = 1;
 }
-#endif /* not SYNTAX_TABLE */
+#endif /* not SYNTAX */
 #endif /* not emacs */
 \f
 /* Compile with `-DRX_DEBUG' and use the following flags.
@@ -4966,7 +4967,7 @@ rx_compile (pattern, size, syntax, rxb)
    */
   rxb->re_nsub = 0;
 
-#if !defined (emacs) && !defined (SYNTAX_TABLE)
+#if !defined (emacs) && !defined (SYNTAX)
   /* Initialize the syntax table.  */
    init_syntax_once ();
 #endif
@@ -6434,9 +6435,9 @@ RE_SEARCH_2_FN (rxb,
 {
   int answer;
   struct re_search_2_closure closure;
-  closure.string1 = string1;
+  closure.string1 = (__const__ unsigned char *) string1;
   closure.size1 = size1;
-  closure.string2 = string2;
+  closure.string2 = (__const__ unsigned char *) string2;
   closure.size2 = size2;
   answer = rx_search (rxb, startpos, range, stop, size1 + size2,
                      re_search_2_get_burst,