vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Jan 10 17:56:15 2019 +0100| [382ee8222808f3f0f85a327eaf0fc6f5030e8785] | committer: Hugo Beauzée-Luyssen
upnp: Fix windows build Always include wincrypt before upnp.h This drops the windows.h include, since it's implied by vlc_common.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=382ee8222808f3f0f85a327eaf0fc6f5030e8785 --- modules/services_discovery/upnp-wrapper.hpp | 3 +++ modules/services_discovery/upnp.hpp | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/services_discovery/upnp-wrapper.hpp b/modules/services_discovery/upnp-wrapper.hpp index f19031d864..417f15a6dd 100644 --- a/modules/services_discovery/upnp-wrapper.hpp +++ b/modules/services_discovery/upnp-wrapper.hpp @@ -35,6 +35,9 @@ #include <algorithm> #include <assert.h> +#ifdef _WIN32 +#include <wincrypt.h> +#endif #include <upnp.h> #include <upnptools.h> diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp index 3b2e80b209..4eef534f91 100644 --- a/modules/services_discovery/upnp.hpp +++ b/modules/services_discovery/upnp.hpp @@ -27,11 +27,6 @@ #include <vector> #include <string> -#ifdef _WIN32 -#include <windows.h> -#include <wincrypt.h> -#endif - #include "upnp-wrapper.hpp" #include "../stream_out/dlna/dlna_common.hpp" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
