master
/ miniconda3 / pkgs / libarchive-3.6.2-h6ac8c49_2 / info / recipe / patches / 0006-VC-openssl-define-inline-as-__inline.patch

0006-VC-openssl-define-inline-as-__inline.patch @a663dc1 

41a0142
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
--- work.orig/libarchive/archive_openssl_evp_private.h	2017-07-09 21:38:04.000000000 -0500
+++ work/libarchive/archive_openssl_evp_private.h	2018-04-22 08:25:29.735929400 -0500
@@ -31,6 +31,11 @@
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* memset */
+
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define inline __inline
+#endif
+
 static inline EVP_MD_CTX *EVP_MD_CTX_new(void)
 {
 	EVP_MD_CTX *ctx = (EVP_MD_CTX *)calloc(1, sizeof(EVP_MD_CTX));
--- work.orig/libarchive/archive_openssl_hmac_private.h	2017-07-09 21:38:04.000000000 -0500
+++ work/libarchive/archive_openssl_hmac_private.h	2018-04-22 08:37:10.860250700 -0500
@@ -31,6 +31,11 @@
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 #include <stdlib.h> /* malloc, free */
 #include <string.h> /* memset */
+
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define inline __inline
+#endif
+
 static inline HMAC_CTX *HMAC_CTX_new(void)
 {
 	HMAC_CTX *ctx = (HMAC_CTX *)calloc(1, sizeof(HMAC_CTX));
--- work.orig/libarchive/xxhash.c	2018-04-23 10:39:36.548437500 -0500
+++ work/libarchive/xxhash.c	2018-04-23 10:40:26.751993100 -0500
@@ -37,6 +37,10 @@
 #include "archive_xxhash.h"
 
 #ifdef HAVE_LIBLZ4
+
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define inline __inline
+#endif
 
 /***************************************
 ** Tuning parameters