[!HAVE_DECL_STRNLEN]: Declare strnlen.

[gnulib.git] / regex.h

diff --git a/regex.h b/regex.h
index 692b93b..2f6860d 100644 (file)
--- a/regex.h
+++ b/regex.h
@@ -294,10 +294,8 @@ typedef enum
    compiled, the `re_nsub' field is available.  All other fields are
    private to the regex routines.  */
 
-#ifndef RE_TRANSLATE_TYPE 
+#ifndef RE_TRANSLATE_TYPE
 #define RE_TRANSLATE_TYPE char *
-#define RE_TRANSLATE(TBL, C) ((TBL)[C])
-#define RE_TRANSLATE_P(TBL) (TBL)
 #endif
 
 struct re_pattern_buffer
@@ -364,9 +362,11 @@ struct re_pattern_buffer
         /* If true, an anchor at a newline matches.  */
   unsigned newline_anchor : 1;
 
+#ifdef emacs
   /* If true, multi-byte form in the `buffer' should be recognized as a
      multibyte character. */
   unsigned multibyte : 1;
+#endif
 
 /* [[[end pattern_buffer]]] */
 };
@@ -412,15 +412,15 @@ typedef struct
    unfortunately clutters up the declarations a bit, but I think it's
    worth it.  */
 
-#if __STDC__
+#if defined __STDC__ || defined PROTOTYPES
 
 #define _RE_ARGS(args) args
 
-#else /* not __STDC__ */
+#else /* not __STDC__  || PROTOTYPES */
 
 #define _RE_ARGS(args) ()
 
-#endif /* not __STDC__ */
+#endif /* not __STDC__  || PROTOTYPES */
 
 /* Sets the current default syntax to SYNTAX, and return the old syntax.
    You can also simply assign to the `re_syntax_options' variable.  */