Merge branch 'rs/pack-objects-pbase-cleanup'

diff --git a/sha1dc/ubc_check.c b/sha1dc/ubc_check.c
index 089dd4743d8bc1c9827e5ce3ca90541d10efbb41..b3beff2afbae0e3ca338bedf20c8b16806fe53ac 100644 (file)
--- a/sha1dc/ubc_check.c
+++ b/sha1dc/ubc_check.c
@@ -24,8 +24,13 @@
 // ubc_check has been verified against ubc_check_verify using the 'ubc_check_test' program in the tools section
 */
 
-#include "git-compat-util.h"
-#include "sha1dc/ubc_check.h"
+#ifndef SHA1DC_NO_STANDARD_INCLUDES
+#include <stdint.h>
+#endif
+#ifdef SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C
+#include SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C
+#endif
+#include "ubc_check.h"
 
 static const uint32_t DV_I_43_0_bit    = (uint32_t)(1) << 0;
 static const uint32_t DV_I_44_0_bit    = (uint32_t)(1) << 1;
@@ -361,3 +366,7 @@ if (mask) {
 
        dvmask[0]=mask;
 }
+
+#ifdef SHA1DC_CUSTOM_TRAILING_INCLUDE_UBC_CHECK_C
+#include SHA1DC_CUSTOM_TRAILING_INCLUDE_UBC_CHECK_C
+#endif