Commit ec032442 by Aki Koskinen

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.
parent a944c6cc
...@@ -7,10 +7,6 @@ ...@@ -7,10 +7,6 @@
#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 "global.h" #include "global.h"
...@@ -26,6 +22,10 @@ ...@@ -26,6 +22,10 @@
# include <netinet/in.h> # include <netinet/in.h>
#endif #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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment