* regcomp.c, regexec.c, regex_internal.c: Back out previous

changes, consolidating in...
* regex_internal.h: ...this file.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8042262..5be2069 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,4 +1,11 @@
 2005-09-15  Derek Price  <derek@ximbiot.com>
+           Paul Eggert  <eggert@cs.ucla.edu>
+
+       * regcomp.c, regexec.c, regex_internal.c: Back out previous
+       changes, consolidating in...
+       * regex_internal.h: ...this file.
+
+2005-09-15  Derek Price  <derek@ximbiot.com>
 
        * regex_internal.h: Blank `pure' for GNUC < 3.
        * regex_internal.c: Ditto, using this...

diff --git a/lib/regcomp.c b/lib/regcomp.c
index 847f385..279b20c 100644 (file)
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -17,19 +17,6 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_MINOR__
-#  define __GNUC_PREREQ(maj, min) \
-       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-#  define __GNUC_PREREQ(maj, min) 0
-# endif
-#endif
-
-#if !__GNUC_PREREQ (3, 1)
-# define always_inline
-#endif
-
 static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
                                          Idx length, reg_syntax_t syntax);
 static void re_compile_fastmap_iter (regex_t *bufp,

diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index 349ec52..ad618cf 100644 (file)
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -17,19 +17,6 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_MINOR__
-#  define __GNUC_PREREQ(maj, min) \
-       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-#  define __GNUC_PREREQ(maj, min) 0
-# endif
-#endif
-
-#if !__GNUC_PREREQ (3, 0)
-# define pure
-#endif
-
 static void re_string_construct_common (const char *str, Idx len,
                                        re_string_t *pstr,
                                        REG_TRANSLATE_TYPE trans, bool icase,

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index c342710..a12b1d9 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -84,6 +84,19 @@
 # define RE_ENABLE_I18N
 #endif
 
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min) \
+       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#if !__GNUC_PREREQ (3, 1)
+# define always_inline
+#endif
+
 #if __GNUC__ >= 3
 # define BE(expr, val) __builtin_expect (expr, val)
 #else

diff --git a/lib/regexec.c b/lib/regexec.c
index 9abdd77..a85077c 100644 (file)
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -17,19 +17,6 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_MINOR__
-#  define __GNUC_PREREQ(maj, min) \
-       ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-#  define __GNUC_PREREQ(maj, min) 0
-# endif
-#endif
-
-#if !__GNUC_PREREQ (3, 1)
-# define always_inline
-#endif
-
 static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
                                     Idx n) internal_function;
 static void match_ctx_clean (re_match_context_t *mctx) internal_function;