From f9e6589d8755e896e2b48ebafad988e572eed2e7 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 17 Nov 2010 02:03:43 +0000 Subject: merge from gcc --- include/ChangeLog | 5 +++++ include/simple-object.h | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/ChangeLog b/include/ChangeLog index 56314cb..bcaf5f2 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2010-11-16 Ian Lance Taylor + + * simple-object.h (simple_object_attributes_merge): Declare, + replacing simple_object_attributes_compare. + 2010-11-16 Jie Zhang * elf/bfin.h (EF_BFIN_CODE_IN_L1): Define. diff --git a/include/simple-object.h b/include/simple-object.h index a72e4a1..c478675 100644 --- a/include/simple-object.h +++ b/include/simple-object.h @@ -117,14 +117,15 @@ extern simple_object_attributes * simple_object_fetch_attributes (simple_object_read *simple_object, const char **errmsg, int *err); -/* Compare ATTRS1 and ATTRS2. If they could be linked together - without error, return NULL. Otherwise, return an error message, - set *ERR to an errno value or 0 if there isn't one. */ +/* Merge the FROM attributes into TO. If two objects with these + attributes could be linked together without error, returns NULL. + Otherwise, returns an error message, and sets *ERR to an errno + value or 0 if there isn't one. */ extern const char * -simple_object_attributes_compare (simple_object_attributes *attrs1, - simple_object_attributes *attrs2, - int *err); +simple_object_attributes_merge (simple_object_attributes *to, + simple_object_attributes *from, + int *err); /* Release all resources associated with ATTRS. */ -- cgit v1.1