Commit a626788c authored by David Woodhouse's avatar David Woodhouse

Reorder header files to include <winsock2.h> before <windows.h>

OpenSSL headers include <windows.h>, it seems, so we need to include
<winsock2.h> before any of those.
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4251eb11
......@@ -29,6 +29,18 @@
#define __OPENCONNECT_PRIVATE__
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <sys/socket.h>
#include <sys/select.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <fcntl.h>
#endif
#include "openconnect.h"
#if defined(OPENCONNECT_OPENSSL) || defined(DTLS_OPENSSL)
......@@ -58,18 +70,6 @@
#include <sys/types.h>
#include <unistd.h>
#ifdef _WIN32
#include <winsock2.h>
#include <ws2tcpip.h>
#else
#include <sys/socket.h>
#include <sys/select.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <fcntl.h>
#endif
#ifdef LIBPROXY_HDR
#include LIBPROXY_HDR
#endif
......
......@@ -27,6 +27,8 @@
#include <sys/types.h>
#include <ctype.h>
#include "openconnect-internal.h"
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/engine.h>
......@@ -37,7 +39,6 @@
#include <openssl/x509.h>
#include <openssl/bio.h>
#include "openconnect-internal.h"
int openconnect_sha1(unsigned char *result, void *data, int len)
{
......
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