From d1245446685ccdc632b6a9cee65391cbe4eac4df Mon Sep 17 00:00:00 2001
From: Jason Toffaletti <toffaletti@gmail.com>
Date: Mon, 6 Jan 2014 16:55:29 +0000
Subject: [PATCH] minor

---
 remote.go | 12 ++++--------
 wrapper.c |  7 ++++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/remote.go b/remote.go
index ebf1fd4..0645291 100644
--- a/remote.go
+++ b/remote.go
@@ -4,12 +4,8 @@ package git
 #include <git2.h>
 #include <git2/errors.h>
 
-static git_remote_callbacks git_remote_callbacks_init() {
-	git_remote_callbacks ret = GIT_REMOTE_CALLBACKS_INIT;
-	return ret;
-}
-
-extern void _setup_callbacks(git_remote_callbacks *callbacks);
+extern void _go_git_setup_callbacks(git_remote_callbacks *callbacks);
+extern git_remote_callbacks _go_git_remote_callbacks_init();
 
 */
 import "C"
@@ -41,11 +37,11 @@ type RemoteCallbacks struct {
 }
 
 func populateRemoteCallbacks(ptr *C.git_remote_callbacks, callbacks *RemoteCallbacks) {
-	*ptr = C.git_remote_callbacks_init()
+	*ptr = C._go_git_remote_callbacks_init()
 	if callbacks == nil {
 		return
 	}
-	C._setup_callbacks(ptr)
+	C._go_git_setup_callbacks(ptr)
 	ptr.payload = unsafe.Pointer(callbacks)
 }
 
diff --git a/wrapper.c b/wrapper.c
index ef05c2d..4543822 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -25,7 +25,7 @@ int _go_git_odb_foreach(git_odb *db, void *payload)
     return git_odb_foreach(db, (git_odb_foreach_cb)&odbForEachCb, payload);
 }
 
-void _setup_callbacks(git_remote_callbacks *callbacks) {
+void _go_git_setup_callbacks(git_remote_callbacks *callbacks) {
 	typedef int (*progress_cb)(const char *str, int len, void *data);
 	typedef int (*completion_cb)(git_remote_completion_type type, void *data);
 	typedef int (*credentials_cb)(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types,	void *data);
@@ -38,4 +38,9 @@ void _setup_callbacks(git_remote_callbacks *callbacks) {
 	callbacks->update_tips = (update_tips_cb)updateTipsCallback;
 }
 
+git_remote_callbacks _go_git_remote_callbacks_init() {
+	git_remote_callbacks ret = GIT_REMOTE_CALLBACKS_INIT;
+	return ret;
+}
+
 /* EOF */