merge from gcc

2011-07-25 17:11:44 +00:00 · 2011-07-25 17:11:44 +00:00 · 080c39ca2a
parent f4fc0c59e3
commit 080c39ca2a
2 changed files with 5 additions and 0 deletions
--- a/include/ChangeLog
+++ b/include/ChangeLog
@ -1,3 +1,7 @@
+2011-07-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* xregex.h (regoff_t): Define.
+
 2011-07-22  Jakub Jelinek  <jakub@redhat.com>

 	* dwarf2.h (DW_AT_GNU_macros): New.
--- a/include/xregex.h
+++ b/include/xregex.h
@ -8,6 +8,7 @@
 #  define regexec xregexec
 #  define regcomp xregcomp
 #  define regerror xregerror
+#  define regoff_t xregoff_t
 #  define re_set_registers xre_set_registers
 #  define re_match_2 xre_match_2
 #  define re_match xre_match