proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 06:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2934 from akikoskinen/mingw_build_fix

Browse Source 
Fix build on mingw (master branch)
This commit is contained in:
Edward Thomson 2015-03-03 10:08:51 -05:00
commit 20273e4d3c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.h
View File

@ -38,6 +38,7 @@
# include <direct.h> # include <direct.h>
# include <winsock2.h> # include <winsock2.h>
# include <windows.h> # include <windows.h>
# include <ws2tcpip.h>
# include "win32/msvc-compat.h" # include "win32/msvc-compat.h"
# include "win32/mingw-compat.h" # include "win32/mingw-compat.h"
# include "win32/error.h" # include "win32/error.h"

17
src/openssl_stream.c
View File

@ -7,14 +7,7 @@
#ifdef GIT_SSL #ifdef GIT_SSL
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/x509v3.h>
#include <ctype.h> #include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include "global.h" #include "global.h"
#include "posix.h" #include "posix.h"
@ -23,6 +16,16 @@
#include "netops.h" #include "netops.h"
#include "git2/transport.h" #include "git2/transport.h"
#ifndef GIT_WIN32
# include <sys/types.h>
# include <sys/socket.h>
# include <netinet/in.h>
#endif
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/x509v3.h>
static int ssl_set_error(SSL *ssl, int error) static int ssl_set_error(SSL *ssl, int error)
{ {
int err; int err;