diff options
| author | Martin Willi <martin@revosec.ch> | 2013-10-25 17:29:31 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-04 15:53:02 +0200 |
| commit | 4f310a2e7538741471f708dc4d23e06d081a2165 (patch) | |
| tree | af0e618246ce4aa8129b203c7a968582714ba14d | |
| parent | b7a4d44bd035eea462b264482a8871a0e26e16ec (diff) | |
| download | strongswan-4f310a2e7538741471f708dc4d23e06d081a2165.tar.bz2 strongswan-4f310a2e7538741471f708dc4d23e06d081a2165.tar.xz | |
openssl: Undef OpenSSLs X509_NAME defined by <wincrypt.h>
| -rw-r--r-- | src/libstrongswan/plugins/openssl/openssl_util.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/openssl/openssl_util.h b/src/libstrongswan/plugins/openssl/openssl_util.h index ce2a9e109..2db073139 100644 --- a/src/libstrongswan/plugins/openssl/openssl_util.h +++ b/src/libstrongswan/plugins/openssl/openssl_util.h @@ -22,6 +22,12 @@ #define OPENSSL_UTIL_H_ #include <library.h> + +#ifdef X509_NAME +/* from <wincrypt.h> */ +# undef X509_NAME +#endif + #include <openssl/bn.h> #include <openssl/asn1.h> |