diff options
| author | Aki Koskinen <aki@secondlion.fi> | 2015-02-27 10:49:02 +0200 |
|---|---|---|
| committer | Aki Koskinen <aki@secondlion.fi> | 2015-02-27 10:49:02 +0200 |
| commit | e1314dd605629db673847d81de6d3b9ee31198c5 (patch) | |
| tree | f9f91f1b1d64a3d4109b2d2eb5fa32a32ba7b492 | |
| parent | 09c2477056d14c5191460c63f236aa38353f9098 (diff) | |
| download | libgit2-e1314dd605629db673847d81de6d3b9ee31198c5.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.
| -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 3a6369dee..108ccfef2 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" @@ -20,6 +16,10 @@ #include "netops.h" #include "git2/transport.h" +#include <openssl/ssl.h> +#include <openssl/err.h> +#include <openssl/x509v3.h> + static int ssl_set_error(SSL *ssl, int error) { int err; |