diff options
| author | Aki Koskinen <aki@secondlion.fi> | 2015-02-27 10:49:02 +0200 |
|---|---|---|
| committer | Aki Koskinen <aki@secondlion.fi> | 2015-03-02 11:15:13 +0200 |
| commit | ec0324422705875e84eb1afdeae36a4e1db5f467 (patch) | |
| tree | 9223f2c45f2079104cf17060e49d5ee671006c57 /src | |
| parent | a944c6cc40273b45922fa22949fe6b12ff668889 (diff) | |
| download | libgit2-ec0324422705875e84eb1afdeae36a4e1db5f467.tar.gz | |
Include openssl headers last
Windows headers #define some names that openssl uses too. Openssl
headers #undef the offending names before reusing them. But if those
offending Windows headers get included after the openssl headers the
namespace is polluted and nothing good happens.
Fixes issue #2850.
Diffstat (limited to 'src')
| -rw-r--r-- | src/openssl_stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openssl_stream.c b/src/openssl_stream.c index e0cf9b6b3..9ddf6e4be 100644 --- a/src/openssl_stream.c +++ b/src/openssl_stream.c @@ -7,10 +7,6 @@ #ifdef GIT_SSL -#include <openssl/ssl.h> -#include <openssl/err.h> -#include <openssl/x509v3.h> - #include <ctype.h> #include "global.h" @@ -26,6 +22,10 @@ # 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) { int err; |