openssl build issue

panda/src/downloader/bioPtr.h

@@ -22,6 +22,7 @@
 #define OPENSSL_NO_KRB5
 
 #include "referenceCount.h"
+#include "openSSLWrapper.h"  // must be included before any other openssl.
 #include "openssl/ssl.h"
 
 class URLSpec;

panda/src/downloader/bioStreamBuf.h

@@ -23,6 +23,7 @@
 
 #include "bioPtr.h"
 #include "pointerTo.h"
+#include "openSSLWrapper.h"  // must be included before any other openssl.
 #include "openssl/ssl.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/downloader/bioStreamPtr.h

@@ -23,6 +23,7 @@
 
 #include "bioStream.h"
 #include "referenceCount.h"
+#include "openSSLWrapper.h"  // must be included before any other openssl.
 #include "openssl/ssl.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/downloader/httpChannel.h

@@ -36,6 +36,7 @@
 #include "pointerTo.h"
 #include "config_downloader.h"
 #include "filename.h"
+#include "openSSLWrapper.h"  // must be included before any other openssl.
 #include "openssl/ssl.h"
 #include "typedReferenceCount.h"
 

panda/src/downloader/httpDigestAuthorization.cxx

@@ -17,6 +17,7 @@
 #ifdef HAVE_OPENSSL
 
 #include "httpChannel.h"
+#include "openSSLWrapper.h"  // must be included before any other openssl.
 #include "openssl/ssl.h"
 #include "openssl/md5.h"
 #include <time.h>

panda/src/express/hashVal.cxx

@@ -14,12 +14,10 @@
 
 #include "hashVal.h"
 #include "virtualFileSystem.h"
-
+#include "openSSLWrapper.h"  // must be included before any other openssl.
+#include "openssl/md5.h"
 #include <ctype.h>
 
-#ifdef HAVE_OPENSSL
-#include "openssl/md5.h"
-#endif  // HAVE_OPENSSL
 
 
 ////////////////////////////////////////////////////////////////////

panda/src/express/openSSLWrapper.h

@@ -18,9 +18,12 @@
 #include "pandabase.h"
 
 #ifdef HAVE_OPENSSL
-
 #include "filename.h"
 
+#ifdef _WIN32
+#include <winsock2.h>  // must be included prior to including OpenSSL.
+#endif
+
 #define OPENSSL_NO_KRB5
 #include "openssl/ssl.h"
 #include "openssl/rand.h"