Skip to content

Commit b42f98a

Browse files
bbolligitster
authored andcommitted
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 <[email protected]> Signed-off-by: Beat Bolli <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b7bd948 commit b42f98a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

packfile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#ifndef PACKFILE_H
22
#define PACKFILE_H
33

4+
#include "cache.h"
45
#include "oidset.h"
56

67
/* in object-store.h */
78
struct packed_git;
89
struct object_info;
9-
enum object_type;
1010

1111
/*
1212
* Generate the filename to be used for a pack file with checksum "sha1" and

0 commit comments

Comments
 (0)