From: Felix Morgner <felix.morgner@gmail.com>
Date: Thu, 18 May 2017 11:11:03 +0000 (+0200)
Subject: Merge pull request #113 from Trivve/patch-2
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=eefe0af1c49c0d4576e8f2379c34472364e6c507;hp=c4f6b1f6d27f7d7a556d30aedee73a675b5a6c48

Merge pull request #113 from Trivve/patch-2

Fix error compiling with mbed TLS 2.4
---

diff --git a/src/ssl.h b/src/ssl.h
index 3d40283..ab02a2d 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -89,20 +89,17 @@ int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
 typedef	ssl_context SSL_handle_t;
 
 #elif defined(USE_MBEDTLS)
-#include <mbedtls/ssl.h>
-#if (MBEDTLS_VERSION_MINOR > 3)
-#include <mbedtls/net_socket.h>
-#else
-#include <mbedtls/net.h>
-#endif
 #include <mbedtls/version.h>
 
-#if defined(MBEDTLS_VERSION_MAJOR)
-#if (MBEDTLS_VERSION_MAJOR < 2)
+#if !defined(MBEDTLS_VERSION_MAJOR) || (MBEDTLS_VERSION_MAJOR < 2)
 #error mbedTLS version 2.0.0 or greater is required!
 #endif
+
+#include <mbedtls/ssl.h>
+#if (MBEDTLS_VERSION_MINOR > 3)
+#include <mbedtls/net_sockets.h>
 #else
-#error mbedTLS version 2.0.0 or greater is required!
+#include <mbedtls/net.h>
 #endif
 
 #if defined(USE_MBEDTLS_HAVEGE)