configure: fix a regression in PCRE v1 detection

diff --git a/tag.c b/tag.c
index 7e10acfb6ef1673e783e0a42e1b8810a6e2eff06..66210fd4772778ac4c95925ec4670717dd27da62 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -47,7 +47,7 @@ int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
                                name_to_report ?
                                name_to_report :
                                find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
-                               typename(type));
+                               type_name(type));
 
        buf = read_sha1_file(oid->hash, &type, &size);
        if (!buf)
@@ -142,13 +142,13 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {
-               item->tagged = &lookup_blob(&oid)->object;
+               item->tagged = (struct object *)lookup_blob(&oid);
        } else if (!strcmp(type, tree_type)) {
-               item->tagged = &lookup_tree(&oid)->object;
+               item->tagged = (struct object *)lookup_tree(&oid);
        } else if (!strcmp(type, commit_type)) {
-               item->tagged = &lookup_commit(&oid)->object;
+               item->tagged = (struct object *)lookup_commit(&oid);
        } else if (!strcmp(type, tag_type)) {
-               item->tagged = &lookup_tag(&oid)->object;
+               item->tagged = (struct object *)lookup_tag(&oid);
        } else {
                error("Unknown type %s", type);
                item->tagged = NULL;