diff options
author | DJ Delorie <dj@redhat.com> | 2010-11-17 02:03:39 +0000 |
---|---|---|
committer | DJ Delorie <dj@redhat.com> | 2010-11-17 02:03:39 +0000 |
commit | 7ee4d16356c5340887b6ff0fb139343ab78c50c6 (patch) | |
tree | 55cd748a479787589ceeaf1b064eafa66c9dfabf /include/simple-object.h | |
parent | 2988dfa72b9f54d7c515c91ab646ee49aaad803f (diff) | |
download | newlib-7ee4d16356c5340887b6ff0fb139343ab78c50c6.zip newlib-7ee4d16356c5340887b6ff0fb139343ab78c50c6.tar.gz newlib-7ee4d16356c5340887b6ff0fb139343ab78c50c6.tar.bz2 |
merge from gcc
Diffstat (limited to 'include/simple-object.h')
-rw-r--r-- | include/simple-object.h | 13 |
1 files changed, 7 insertions, 6 deletions
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. */ |