Merge branch 'bb/redecl-enum-fix'

Compilation fix.

* bb/redecl-enum-fix:
  packfile: ensure that enum object_type is defined
This commit is contained in:
Junio C Hamano
2018-08-15 15:08:26 -07:00

View File

@ -1,12 +1,12 @@
#ifndef PACKFILE_H #ifndef PACKFILE_H
#define PACKFILE_H #define PACKFILE_H
#include "cache.h"
#include "oidset.h" #include "oidset.h"
/* in object-store.h */ /* in object-store.h */
struct packed_git; struct packed_git;
struct object_info; struct object_info;
enum object_type;
/* /*
* Generate the filename to be used for a pack file with checksum "sha1" and * Generate the filename to be used for a pack file with checksum "sha1" and