I forgot to remove these prototypes when removing these functions in v1.7.10-rc0~118^2~4^2~5^2~4 (vcs-svn: eliminate repo_tree structure, 2010-12-10). Noticed by building a new file that included both repo_tree.h and repository.h ("error: conflicting types for 'repo_init'"). Reported-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> Reported-by: Stefan Beller <sbeller@xxxxxxxxxx> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- vcs-svn/repo_tree.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h index 889c6a3c95..6c2f5f8a00 100644 --- a/vcs-svn/repo_tree.h +++ b/vcs-svn/repo_tree.h @@ -1,23 +1,13 @@ #ifndef REPO_TREE_H_ #define REPO_TREE_H_ -struct strbuf; - #define REPO_MODE_DIR 0040000 #define REPO_MODE_BLB 0100644 #define REPO_MODE_EXE 0100755 #define REPO_MODE_LNK 0120000 -uint32_t next_blob_mark(void); void repo_copy(uint32_t revision, const char *src, const char *dst); -void repo_add(const char *path, uint32_t mode, uint32_t blob_mark); const char *repo_read_path(const char *path, uint32_t *mode_out); void repo_delete(const char *path); -void repo_commit(uint32_t revision, const char *author, - const struct strbuf *log, const char *uuid, const char *url, - long unsigned timestamp); -void repo_diff(uint32_t r1, uint32_t r2); -void repo_init(void); -void repo_reset(void); #endif -- 2.14.1.342.g6490525c54