Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/varint.h b/varint.h
index 032119579694f6a82f3947bfafb05a801385cb5a..f78bb0ca528dcd2b955fba8ca1d9e3db7f776abb 100644 (file)
--- a/varint.h
+++ b/varint.h
@@ -1,9 +1,7 @@
 #ifndef VARINT_H
 #define VARINT_H
 
-#include "git-compat-util.h"
-
-extern int encode_varint(uintmax_t, unsigned char *);
-extern uintmax_t decode_varint(const unsigned char **);
+int encode_varint(uintmax_t, unsigned char *);
+uintmax_t decode_varint(const unsigned char **);
 
 #endif /* VARINT_H */