Merge branch 'dl/branch-from-3dot-merge-base'

diff --git a/bulk-checkin.h b/bulk-checkin.h
index f438f93811bfc62aa79a9ba6f9476240100e286f..b26f3dc3b74cb9ccb4ea630fafe8cd0cdcf5a012 100644 (file)
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -6,11 +6,11 @@
 
 #include "cache.h"
 
-extern int index_bulk_checkin(struct object_id *oid,
-                             int fd, size_t size, enum object_type type,
-                             const char *path, unsigned flags);
+int index_bulk_checkin(struct object_id *oid,
+                      int fd, size_t size, enum object_type type,
+                      const char *path, unsigned flags);
 
-extern void plug_bulk_checkin(void);
-extern void unplug_bulk_checkin(void);
+void plug_bulk_checkin(void);
+void unplug_bulk_checkin(void);
 
 #endif