diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-05-05 16:47:20 -0700 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-05-05 16:47:20 -0700 |
| commit | cd58c15c589970765cd46e7bbdaebf6250fd7626 (patch) | |
| tree | f7f95202e96151b3ac7ea22697e7e60825375268 /src/netops.h | |
| parent | 48ecd122ea6fb8cf12fb4029974c314e5d9efb62 (diff) | |
| parent | 35cdd261f353696181236328323e8d123cad57d4 (diff) | |
| download | libgit2-cd58c15c589970765cd46e7bbdaebf6250fd7626.tar.gz | |
Merge remote-tracking branch 'scottjg/fix-mingw32' into development
Conflicts:
src/netops.c
src/netops.h
src/transports/http.c
tests-clar/clar
Diffstat (limited to 'src/netops.h')
| -rw-r--r-- | src/netops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netops.h b/src/netops.h index f370019ff..9d13f3891 100644 --- a/src/netops.h +++ b/src/netops.h @@ -21,7 +21,7 @@ int gitno_recv(gitno_buffer *buf); void gitno_consume(gitno_buffer *buf, const char *ptr); void gitno_consume_n(gitno_buffer *buf, size_t cons); -GIT_SOCKET gitno_connect(const char *host, const char *port); +int gitno_connect(GIT_SOCKET *s, const char *host, const char *port); int gitno_send(GIT_SOCKET s, const char *msg, size_t len, int flags); int gitno_close(GIT_SOCKET s); int gitno_send_chunk_size(int s, size_t len); |