diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-06-02 07:34:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-02 07:34:27 +0900 |
| commit | ed125c4f07ba69c53c9f4d74ff395a4bf7854ea7 (patch) | |
| tree | 1b3ef9a17cbb929d5497a136aa7b6a08a49aaa9d /builtin | |
| parent | Git 2.32-rc2 (diff) | |
| parent | builtin/fsck.c: don't conflate "int" and "enum" in callback (diff) | |
| download | tgif-ed125c4f07ba69c53c9f4d74ff395a4bf7854ea7.tar.xz | |
Merge branch 'ab/fsck-api-cleanup'
Last minute compilation fix.
* ab/fsck-api-cleanup:
builtin/fsck.c: don't conflate "int" and "enum" in callback
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fsck.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 87a99b0108..b42b6fe21f 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -109,7 +109,8 @@ static int fsck_error_func(struct fsck_options *o, static struct object_array pending; -static int mark_object(struct object *obj, int type, void *data, struct fsck_options *options) +static int mark_object(struct object *obj, enum object_type type, + void *data, struct fsck_options *options) { struct object *parent = data; |