aboutsummaryrefslogtreecommitdiff
path: root/libiberty/simple-object-common.h
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2010-11-17 02:03:43 +0000
committerDJ Delorie <dj@redhat.com>2010-11-17 02:03:43 +0000
commitf9e6589d8755e896e2b48ebafad988e572eed2e7 (patch)
tree2ca17c836711a86d1c79c82930b3215c4700b950 /libiberty/simple-object-common.h
parentab8056e082820630f09bde048adbebbee05d6ddb (diff)
downloadgdb-f9e6589d8755e896e2b48ebafad988e572eed2e7.zip
gdb-f9e6589d8755e896e2b48ebafad988e572eed2e7.tar.gz
gdb-f9e6589d8755e896e2b48ebafad988e572eed2e7.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty/simple-object-common.h')
-rw-r--r--libiberty/simple-object-common.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libiberty/simple-object-common.h b/libiberty/simple-object-common.h
index 8f74390..264b179 100644
--- a/libiberty/simple-object-common.h
+++ b/libiberty/simple-object-common.h
@@ -123,10 +123,10 @@ struct simple_object_functions
/* Release the private data for an simple_object_read. */
void (*release_read) (void *);
- /* Compare the private data for the attributes of two files. If
- they are the same, in the sense that they could be linked
- together, return NULL. Otherwise return an error message. */
- const char *(*attributes_compare) (void *, void *, int *err);
+ /* Merge the private data for the attributes of two files. If they
+ could be linked together, return NULL. Otherwise return an error
+ message. */
+ const char *(*attributes_merge) (void *, void *, int *err);
/* Release the private data for an simple_object_attributes. */
void (*release_attributes) (void *);