From: Beat Bolli Date: Wed, 25 Jul 2018 21:56:07 +0000 (+0200) Subject: packfile: ensure that enum object_type is defined X-Git-Tag: v2.19.0-rc0~67^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b42f98af096bfdf90339def75fe969b9d969b0f6;p=git packfile: ensure that enum object_type is defined When compiling under Apple LLVM version 9.1.0 (clang-902.0.39.2) with "make DEVELOPER=1 DEVOPTS=pedantic", the compiler says error: redeclaration of already-defined enum 'object_type' is a GNU extension [-Werror,-Wgnu-redeclared-enum] According to https://en.cppreference.com/w/c/language/declarations (section "Redeclaration"), a repeated declaration after the definition is only legal for structs and unions, but not for enums. Drop the belated declaration of enum object_type and include cache.h instead to make sure the enum is defined. Helped-by: Jonathan Nieder Signed-off-by: Beat Bolli Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- diff --git a/packfile.h b/packfile.h index cc7eaffe1b..fa36c473ad 100644 --- a/packfile.h +++ b/packfile.h @@ -1,12 +1,12 @@ #ifndef PACKFILE_H #define PACKFILE_H +#include "cache.h" #include "oidset.h" /* in object-store.h */ struct packed_git; struct object_info; -enum object_type; /* * Generate the filename to be used for a pack file with checksum "sha1" and