aboutsummaryrefslogtreecommitdiff
path: root/patches/ossl_typ.h.patch
diff options
context:
space:
mode:
authorScott Parker <scottp.sk8@gmail.com>2015-07-06 13:42:54 -0700
committerBrent Cook <bcook@openbsd.org>2015-07-16 13:09:42 -0500
commit0bab46dde22f6096ad85df4dd39a0f01758d234f (patch)
tree98d6c0d248665c85d1e7c4e3347545946c92c97f /patches/ossl_typ.h.patch
parentb9291face3ec7c804b6171857f95594d12384706 (diff)
downloadportable-0bab46dde22f6096ad85df4dd39a0f01758d234f.tar.gz
portable-0bab46dde22f6096ad85df4dd39a0f01758d234f.tar.bz2
portable-0bab46dde22f6096ad85df4dd39a0f01758d234f.zip
patch headers to avoid redefinitions on windows
Diffstat (limited to 'patches/ossl_typ.h.patch')
-rw-r--r--patches/ossl_typ.h.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/patches/ossl_typ.h.patch b/patches/ossl_typ.h.patch
new file mode 100644
index 0000000..af9419a
--- /dev/null
+++ b/patches/ossl_typ.h.patch
@@ -0,0 +1,23 @@
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
3@@ -100,6 +100,20 @@
4 typedef struct ASN1_ITEM_st ASN1_ITEM;
5 typedef struct asn1_pctx_st ASN1_PCTX;
6
7+#if defined(_WIN32) && defined(__WINCRYPT_H__)
8+#ifdef _MSC_VER
9+#pragma message("Warning, overriding WinCrypt defines")
10+#else
11+#warning overriding WinCrypt defines
12+#endif
13+#undef X509_NAME
14+#undef X509_CERT_PAIR
15+#undef X509_EXTENSIONS
16+#undef OCSP_REQUEST
17+#undef OCSP_RESPONSE
18+#undef PKCS7_ISSUER_AND_SERIAL
19+#endif
20+
21 #ifdef BIGNUM
22 #undef BIGNUM
23 #endif