diff options
| author | DJ Delorie <dj@redhat.com> | 2011-07-25 21:11:44 +0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2011-07-25 21:11:44 +0400 |
| commit | 080c39ca2ab62c372606a649ae93de94e0b15c0b (patch) | |
| tree | fae28de3762b159ef732666d5423f7d9bc3a1025 /include | |
| parent | f4fc0c59e371d4d726e10745101431214b6e3c73 (diff) | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/xregex.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 255806efb..53984e1c0 100644 --- 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. diff --git a/include/xregex.h b/include/xregex.h index 645195bbc..4c5ef9345 100644 --- 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 |