aboutsummaryrefslogtreecommitdiff
path: root/patches/ossl_typ.h.patch
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2014-07-10 22:06:10 -0500
committerBrent Cook <bcook@openbsd.org>2015-07-21 12:08:18 -0500
commit5d8a1cf7155130bd8101090d7e1d0c2f90d9b123 (patch)
tree286f7d12e3647f94bd1e6e8e180a4bf6215a0740 /patches/ossl_typ.h.patch
parent7a4a37cf596697ae96eeb1c555989e6d1a443187 (diff)
downloadportable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.gz
portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.bz2
portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.zip
add initial CMake and Visual Studio build support
This moves the compatibility include files from include to include/compat so we can use the awful MS C compiler <../include/> trick to emulate the GNU #include_next extension. This also removes a few old compat files we do not need anymore.
Diffstat (limited to 'patches/ossl_typ.h.patch')
-rw-r--r--patches/ossl_typ.h.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/patches/ossl_typ.h.patch b/patches/ossl_typ.h.patch
index af9419a..f213347 100644
--- a/patches/ossl_typ.h.patch
+++ b/patches/ossl_typ.h.patch
@@ -1,15 +1,17 @@
1--- include/openssl/ossl_typ.h.orig 2015-07-06 13:21:18.788571423 -0700 1--- include/openssl/ossl_typ.h.orig 2015-07-06 13:21:18.788571423 -0700
2+++ include/openssl/ossl_typ.h 2015-07-06 13:24:14.906468003 -0700 2+++ include/openssl/ossl_typ.h 2015-07-06 13:24:14.906468003 -0700
3@@ -100,6 +100,20 @@ 3@@ -100,6 +100,22 @@
4 typedef struct ASN1_ITEM_st ASN1_ITEM; 4 typedef struct ASN1_ITEM_st ASN1_ITEM;
5 typedef struct asn1_pctx_st ASN1_PCTX; 5 typedef struct asn1_pctx_st ASN1_PCTX;
6 6
7+#if defined(_WIN32) && defined(__WINCRYPT_H__) 7+#if defined(_WIN32) && defined(__WINCRYPT_H__)
8+#ifndef LIBRESSL_INTERNAL
8+#ifdef _MSC_VER 9+#ifdef _MSC_VER
9+#pragma message("Warning, overriding WinCrypt defines") 10+#pragma message("Warning, overriding WinCrypt defines")
10+#else 11+#else
11+#warning overriding WinCrypt defines 12+#warning overriding WinCrypt defines
12+#endif 13+#endif
14+#endif
13+#undef X509_NAME 15+#undef X509_NAME
14+#undef X509_CERT_PAIR 16+#undef X509_CERT_PAIR
15+#undef X509_EXTENSIONS 17+#undef X509_EXTENSIONS