0006-VC-openssl-define-inline-as-__inline.patch 1.4 KB

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