projects
/
platform
/
upstream
/
gst-plugins-bad.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2aea469
)
dtls: Fix name conflict with openssl on win32
author
Paul Arzelier
<paul.arzelier@free.fr>
Wed, 14 Oct 2015 20:51:29 +0000
(22:51 +0200)
committer
Sebastian Dröge
<sebastian@centricular.com>
Sat, 17 Oct 2015 08:04:11 +0000
(11:04 +0300)
https://bugzilla.gnome.org/show_bug.cgi?id=756592
ext/dtls/gstdtlscertificate.c
patch
|
blob
|
history
diff --git
a/ext/dtls/gstdtlscertificate.c
b/ext/dtls/gstdtlscertificate.c
index e37494f0d7bd4c93a42f4f1c9ce665f6d9c57b33..95fbb83ab6f72d86f5cb8a6787b607ce1b31c132 100644
(file)
--- 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);