aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-11-21 14:56:46 -0800
committerGarrett D'Amore <garrett@damore.org>2017-11-21 14:56:46 -0800
commitfa85c84d49282c41b6754060b7420151138bbd23 (patch)
treec9a8a134bbe5fa1e625c033ef4cf02a450ff21c2
parentc9f3e1eeb95160bd690fe37636e732421543bd13 (diff)
downloadnng-fa85c84d49282c41b6754060b7420151138bbd23.tar.gz
nng-fa85c84d49282c41b6754060b7420151138bbd23.tar.bz2
nng-fa85c84d49282c41b6754060b7420151138bbd23.zip
Cope better with the net.h rename in mbedTLS 2.4.0.
-rw-r--r--src/supplemental/mbedtls/tls.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/supplemental/mbedtls/tls.c b/src/supplemental/mbedtls/tls.c
index 80660469..a33c72b4 100644
--- a/src/supplemental/mbedtls/tls.c
+++ b/src/supplemental/mbedtls/tls.c
@@ -14,8 +14,17 @@
#include <stdlib.h>
#include <string.h>
+#include "mbedtls/version.h" // Must be first in order to pick up version
+
#include "mbedtls/error.h"
+
+// mbedTLS renamed this header for 2.4.0.
+#if MBEDTLS_VERSION_MAJOR > 2 || MBEDTLS_VERSION_MINOR >= 4
+#include "mbedtls/net_sockets.h"
+#else
#include "mbedtls/net.h"
+#endif
+
#include "mbedtls/ssl.h"
#include "core/nng_impl.h"