From: Martin Willi <martin@revosec.ch>
Date: Fri, 25 Oct 2013 15:30:27 +0000 (+0200)
Subject: openssl: Fix includes to prevent <winsock2.h> to complain about include order
X-Git-Tag: 5.2.0dr6~24^2~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06c33ebf6a7abea85dfece0ada532c60b69628a5;p=thirdparty%2Fstrongswan.git

openssl: Fix includes to prevent <winsock2.h> to complain about include order
---

diff --git a/src/libstrongswan/plugins/openssl/openssl_plugin.c b/src/libstrongswan/plugins/openssl/openssl_plugin.c
index f4aef82002..372a480fad 100644
--- a/src/libstrongswan/plugins/openssl/openssl_plugin.c
+++ b/src/libstrongswan/plugins/openssl/openssl_plugin.c
@@ -14,6 +14,12 @@
  * for more details.
  */
 
+#include <library.h>
+#include <utils/debug.h>
+#include <threading/thread.h>
+#include <threading/mutex.h>
+#include <threading/thread_value.h>
+
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/conf.h>
@@ -24,12 +30,6 @@
 #endif
 
 #include "openssl_plugin.h"
-
-#include <library.h>
-#include <utils/debug.h>
-#include <threading/thread.h>
-#include <threading/mutex.h>
-#include <threading/thread_value.h>
 #include "openssl_util.h"
 #include "openssl_crypter.h"
 #include "openssl_hasher.h"
diff --git a/src/libstrongswan/plugins/openssl/openssl_rng.c b/src/libstrongswan/plugins/openssl/openssl_rng.c
index 815cf4f0c1..c807bb6072 100644
--- a/src/libstrongswan/plugins/openssl/openssl_rng.c
+++ b/src/libstrongswan/plugins/openssl/openssl_rng.c
@@ -20,7 +20,9 @@
  * THE SOFTWARE.
  */
 
+#include <library.h>
 #include <utils/debug.h>
+
 #include <openssl/rand.h>
 #include <openssl/err.h>