tree.h in rugged-0.27.10.1

- old
+ new

@@ -187,11 +187,11 @@
  * Get the type of the object pointed by the entry
  *
  * @param entry a tree entry
  * @return the type of the pointed object
  */
-GIT_EXTERN(git_object_t) git_tree_entry_type(const git_tree_entry *entry);
+GIT_EXTERN(git_otype) git_tree_entry_type(const git_tree_entry *entry);
 
 /**
  * Get the UNIX file attributes of a tree entry
  *
  * @param entry a tree entry
@@ -265,11 +265,11 @@
  * Get the number of entries listed in a treebuilder
  *
  * @param bld a previously loaded treebuilder.
  * @return the number of entries in the treebuilder
  */
-GIT_EXTERN(size_t) git_treebuilder_entrycount(git_treebuilder *bld);
+GIT_EXTERN(unsigned int) git_treebuilder_entrycount(git_treebuilder *bld);
 
 /**
  * Free a tree builder
  *
  * This will clear all the entries and free to builder.
@@ -342,11 +342,11 @@
  *
  * The return value is treated as a boolean, with zero indicating that the
  * entry should be left alone and any non-zero value meaning that the
  * entry should be removed from the treebuilder list (i.e. filtered out).
  */
-typedef int GIT_CALLBACK(git_treebuilder_filter_cb)(
+typedef int (*git_treebuilder_filter_cb)(
 	const git_tree_entry *entry, void *payload);
 
 /**
  * Selectively remove entries in the tree
  *
@@ -389,10 +389,10 @@
  */
 GIT_EXTERN(int) git_treebuilder_write_with_buffer(
 	git_oid *oid, git_treebuilder *bld, git_buf *tree);
 
 /** Callback for the tree traversal method */
-typedef int GIT_CALLBACK(git_treewalk_cb)(
+typedef int (*git_treewalk_cb)(
 	const char *root, const git_tree_entry *entry, void *payload);
 
 /** Tree traversal modes */
 typedef enum {
 	GIT_TREEWALK_PRE = 0, /* Pre-order */