generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
aad86fe1f9
libreSSL/patches/x509.h.patch

23 lines
525 B
Diff
Raw Normal View History

patch headers to avoid redefinitions on windows
2015-07-06 22:42:54 +02:00
--- include/openssl/x509.h.orig 2015-07-06 13:15:15.059306046 -0700
+++ include/openssl/x509.h 2015-07-06 13:16:10.506118278 -0700
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.
2014-07-11 05:06:10 +02:00
@@ -112,6 +112,19 @@
patch headers to avoid redefinitions on windows
2015-07-06 22:42:54 +02:00
extern "C" {
#endif
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.
2014-07-11 05:06:10 +02:00
+#if defined(_WIN32)
+#ifndef LIBRESSL_INTERNAL
patch headers to avoid redefinitions on windows
2015-07-06 22:42:54 +02:00
+#ifdef _MSC_VER
+#pragma message("Warning, overriding WinCrypt defines")
+#else
+#warning overriding WinCrypt defines
+#endif
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.
2014-07-11 05:06:10 +02:00
+#endif
patch headers to avoid redefinitions on windows
2015-07-06 22:42:54 +02:00
+#undef X509_NAME
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#endif
+
#define X509_FILETYPE_PEM 1
#define X509_FILETYPE_ASN1 2
#define X509_FILETYPE_DEFAULT 3
Reference in New Issue Copy Permalink