fix: for libgit2-0.19.0

liuguangzhao · liuguangzhao · commit 0a19b95dc7d3 · 2013-12-13T10:35:46.000Z
diff --git a/php_git2.h b/php_git2.h
@@ -41,6 +41,7 @@
 #  include <git2.h>
 #  include <git2/errors.h>
 #  include <git2/odb_backend.h>
+#  include <git2/sys/odb_backend.h>
 
 extern zend_module_entry git2_module_entry;
 
diff --git a/reference.c b/reference.c
@@ -303,7 +303,8 @@ PHP_METHOD(git2_reference, each)
 	MAKE_STD_ZVAL(opaque.result);
 	array_init(opaque.result);
 	
-	git_reference_foreach(m_repository->repository, list_flags, &php_git2_ref_foreach_cb, (void *)&opaque);
+	git_reference_foreach(m_repository->repository, &php_git2_ref_foreach_cb, (void *)&opaque);
+	// git_reference_foreach(m_repository->repository, list_flags, &php_git2_ref_foreach_cb, (void *)&opaque);
 	
 	RETVAL_ZVAL(opaque.result,0,1);
 }
@@ -334,4 +335,4 @@ void php_git2_reference_init(TSRMLS_D)
 	INIT_NS_CLASS_ENTRY(ce, PHP_GIT2_NS, "Reference", php_git2_reference_methods);
 	git2_reference_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
 	git2_reference_class_entry->create_object = php_git2_reference_new;
-}
+}
diff --git a/remote.c b/remote.c
@@ -22,8 +22,12 @@
  * THE SOFTWARE.
  */
 
+#include <git2/indexer.h>
+
 #include "php_git2.h"
 
+
+
 PHPAPI zend_class_entry *git2_remote_class_entry;
 
 static void php_git2_remote_free_storage(php_git2_remote *object TSRMLS_DC)
@@ -88,7 +92,7 @@ PHP_METHOD(git2_remote, __construct)
 /* }}} */
 
 
-static int php_git2_rename_packfile(char *packname, git_indexer *idx)
+static int php_git2_rename_packfile(char *packname, git_indexer_stream *idx)
 {
 	char path[GIT_PATH_MAX], oid[GIT_OID_HEXSZ + 1], *slash;
 	int ret;
@@ -124,7 +128,7 @@ static int show_ref__cb(git_remote_head *head, void *payload)
 PHP_METHOD(git2_remote, fetch)
 {
 	php_git2_remote *m_remote;
-	git_indexer *idx = NULL;
+	git_indexer_stream *idx = NULL;
 	git_transfer_progress stats;
 	char *packname = NULL;
 	int error = 0;
@@ -138,7 +142,8 @@ PHP_METHOD(git2_remote, fetch)
 		return;
 	}
 */
-	direction = GIT_DIR_FETCH;
+	direction = 0;
+	//direction = GIT_DIR_FETCH;
 	
 	error = git_remote_connect(m_remote->remote, direction);
 	error = git_remote_ls(m_remote->remote, &show_ref__cb, NULL);
@@ -180,4 +185,4 @@ void php_git2_remote_init(TSRMLS_D)
 	INIT_NS_CLASS_ENTRY(ce, PHP_GIT2_NS, "Remote", php_git2_remote_methods);
 	git2_remote_class_entry = zend_register_internal_class(&ce TSRMLS_CC);
 	git2_remote_class_entry->create_object = php_git2_remote_new;
-}
+}
