Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

diff --git a/replace-object.h b/replace-object.h
index 16528df942f79e3d7ce65d99e0103395d0c69f51..04ed7a85a2402d64e715c38850a41bea43d0f3b3 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -16,8 +16,8 @@ void prepare_replace_object(struct repository *r);
  * This internal function is only declared here for the benefit of
  * lookup_replace_object().  Please do not call it directly.
  */
-extern const struct object_id *do_lookup_replace_object(struct repository *r,
-                                                       const struct object_id *oid);
+const struct object_id *do_lookup_replace_object(struct repository *r,
+                                                const struct object_id *oid);
 
 /*
  * If object sha1 should be replaced, return the replacement object's