Merge branch 'master' of https://github.com/despair86/loki-network

crypto/libntrup/src/ref/r3_recip.c

@@ -2,9 +2,6 @@
 #include "mod3.h"
 #include "swap.h"
 #include "r3.h"
-#ifdef _MSC_VER
-#include <assert.h>
-#endif
 
 /* caller must ensure that x-y does not overflow */
 static int smaller_mask(int x,int y)

crypto/libntrup/src/ref/rq_recip3.c

@@ -1,9 +1,6 @@
 #include "params.h"
 #include "swap.h"
 #include "rq.h"
-#ifdef _MSC_VER
-#include <assert.h>
-#endif
 
 /* caller must ensure that x-y does not overflow */
 static int smaller_mask(int x,int y)

include/llarp/ip.hpp

@@ -38,6 +38,7 @@ typedef struct ip_hdr
 #define daddr ip_destaddr
 #define check ip_checksum
 #define ihl ip_header_len
+#define ip_version version
 #endif
 #include <memory>
 #if !defined(__linux__) && !defined(_WIN32)