summaryrefslogtreecommitdiff
path: root/include/git2/net.h
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2013-04-16 17:46:41 +0200
committerVicent Marti <tanoku@gmail.com>2013-04-16 17:46:41 +0200
commita50086d174658914d4d6462afbc83b02825b1f5b (patch)
treee8daa1c7bf678222cf351445179837bed7db3a72 /include/git2/net.h
parent5b9fac39d8a76b9139667c26a63e6b3f204b3977 (diff)
parentf124ebd457bfbf43de3516629aaba5a279636e04 (diff)
downloadlibgit2-a50086d174658914d4d6462afbc83b02825b1f5b.tar.gz
Merge branch 'development'v0.18.0
Diffstat (limited to 'include/git2/net.h')
-rw-r--r--include/git2/net.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/include/git2/net.h b/include/git2/net.h
index c2301b6f1..e70ba1f71 100644
--- a/include/git2/net.h
+++ b/include/git2/net.h
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2009-2012 the libgit2 contributors
+ * Copyright (C) the libgit2 contributors. All rights reserved.
*
* This file is part of libgit2, distributed under the GNU GPL v2 with
* a Linking Exception. For full terms see the included COPYING file.
*/
-#ifndef INCLUDE_net_h__
-#define INCLUDE_net_h__
+#ifndef INCLUDE_git_net_h__
+#define INCLUDE_git_net_h__
#include "common.h"
#include "oid.h"
@@ -27,15 +27,17 @@ GIT_BEGIN_DECL
* gets called.
*/
-#define GIT_DIR_FETCH 0
-#define GIT_DIR_PUSH 1
+typedef enum {
+ GIT_DIRECTION_FETCH = 0,
+ GIT_DIRECTION_PUSH = 1
+} git_direction;
/**
* Remote head description, given out on `ls` calls.
*/
struct git_remote_head {
- int local:1; /* available locally */
+ int local; /* available locally */
git_oid oid;
git_oid loid;
char *name;
@@ -44,7 +46,7 @@ struct git_remote_head {
/**
* Callback for listing the remote heads
*/
-typedef int (*git_headlist_cb)(git_remote_head *, void *);
+typedef int (*git_headlist_cb)(git_remote_head *rhead, void *payload);
/** @} */
GIT_END_DECL