X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=merge-blobs.h;h=13cf9669e5b2c43b34bbecd2ea71bf14d9a36d65;hb=cb56cf3b2d4a18e0e11846180828a1da502d70bd;hp=cc31038b807fbee073a063ec83fe298c87fd2b3d;hpb=7fa92ba40abbe4236226e7d91e664bbeab8c43f2;p=thirdparty%2Fgit.git

diff --git a/merge-blobs.h b/merge-blobs.h
index cc31038b80..13cf9669e5 100644
--- a/merge-blobs.h
+++ b/merge-blobs.h
@@ -4,8 +4,8 @@
 struct blob;
 struct index_state;
 
-extern void *merge_blobs(struct index_state *, const char *,
-			 struct blob *, struct blob *,
-			 struct blob *, unsigned long *);
+void *merge_blobs(struct index_state *, const char *,
+		  struct blob *, struct blob *,
+		  struct blob *, unsigned long *);
 
 #endif /* MERGE_BLOBS_H */