merge from gcc

diff --git a/include/ChangeLog b/include/ChangeLog
index b76bfff5eb1140c2cb604bc047a979d456116e0b..d55ed4a8af1a26b14636cce7f580884d11c32885 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-02  Mark Kettenis  <kettenis@gnu.org>
+
+       * xregex.h (_REGEX_RE_COMP): Define.
+       (re_comp): Define to xre_comp.
+       (re_exec): Define to xre_exec.
+
 2001-08-02  Charles Wilson  <cwilson@ece.gatech.edu>
 
         * bfdlink.h (struct bfd_link_info): add new boolean

diff --git a/include/xregex.h b/include/xregex.h
index 694fd166f1080139e3d2a3625d8aebfd147c302a..645195bbceb53ce9716092dcd9a4749f01aad85d 100644 (file)
--- a/include/xregex.h
+++ b/include/xregex.h
@@ -19,6 +19,10 @@
 #  define re_syntax_options xre_syntax_options
 #  define re_max_failures xre_max_failures
 
+#  define _REGEX_RE_COMP
+#  define re_comp xre_comp
+#  define re_exec xre_exec
+
 #include "xregex2.h"
 
 #endif /* xregex.h */