diff options
author | Paul Arzelier <paul.arzelier@free.fr> | 2015-10-14 22:51:29 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-10-17 11:04:11 +0300 |
commit | 3a831e43af1d8efffff1dbb61ecba2be57f9fd80 (patch) | |
tree | c23f5ba5384ae8b09ceee0c992e2eb94db81be70 | |
parent | 2aea46912b6fa886d16a289da3bfb4d78ae4d3e4 (diff) | |
download | gstreamer-plugins-bad-3a831e43af1d8efffff1dbb61ecba2be57f9fd80.tar.gz |
dtls: Fix name conflict with openssl on win32
https://bugzilla.gnome.org/show_bug.cgi?id=756592
-rw-r--r-- | ext/dtls/gstdtlscertificate.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ext/dtls/gstdtlscertificate.c b/ext/dtls/gstdtlscertificate.c index e37494f0d..95fbb83ab 100644 --- a/ext/dtls/gstdtlscertificate.c +++ b/ext/dtls/gstdtlscertificate.c @@ -38,6 +38,13 @@ # define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER #endif +#ifdef G_OS_WIN32 +#include <windows.h> +#ifdef X509_NAME +#undef X509_NAME +#endif +#endif + #include <openssl/ssl.h> GST_DEBUG_CATEGORY_STATIC (gst_dtls_certificate_debug); |