From: Guy Harris <guy@alum.mit.edu>
Date: Wed, 9 Jan 2019 19:33:05 +0000 (-0800)
Subject: Include pcap/socket.h before any OpenSSL headers.
X-Git-Tag: libpcap-1.10-bp~640
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/05d359811683ef6243118170037dac226e770a37

Include pcap/socket.h before any OpenSSL headers.

Including WinSock headers is a game of Whac-A-Mole - if you ever get
winsock.h included before ws2def.h, you get a pile of errors, so you
have to be careful to include headers in just the right order.

See if this keeps moles from popping up.
---

diff --git a/sslutils.h b/sslutils.h
index 262b5e33..a9ffde83 100644
--- a/sslutils.h
+++ b/sslutils.h
@@ -34,9 +34,9 @@
 #define __SSLUTILS_H__
 
 #ifdef HAVE_OPENSSL
+#include "pcap/socket.h"  // for SOCKET
 #include <openssl/ssl.h>
 #include <openssl/err.h>
-#include "pcap/socket.h"  // for SOCKET
 
 /*
  * Utility functions