aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2011-07-25 17:11:48 +0000
committerDJ Delorie <dj@redhat.com>2011-07-25 17:11:48 +0000
commit17a16b0f109f8663ff1e84a74dce5dee1707bf61 (patch)
tree516db429edb2edd2455993ef9be023b8acda4e50 /include
parent543305c9cd7417b50b1e6d1fce6c7e0e44741bf4 (diff)
downloadfsf-binutils-gdb-17a16b0f109f8663ff1e84a74dce5dee1707bf61.zip
fsf-binutils-gdb-17a16b0f109f8663ff1e84a74dce5dee1707bf61.tar.gz
fsf-binutils-gdb-17a16b0f109f8663ff1e84a74dce5dee1707bf61.tar.bz2
merge from gcc
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog4
-rw-r--r--include/xregex.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 255806e..53984e1 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 645195b..4c5ef93 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