vlc | branch: master | Shaleen Jain <[email protected]> | Wed Jun 27 18:02:32 2018 +0530| [902b94fcc3e72aae37f0fb9134ba69beb3ed1b95] | committer: Hugo Beauzée-Luyssen
upnp: include config.h from source files Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=902b94fcc3e72aae37f0fb9134ba69beb3ed1b95 --- modules/services_discovery/upnp-wrapper.cpp | 6 ++++++ modules/services_discovery/upnp-wrapper.hpp | 7 +------ modules/services_discovery/upnp.cpp | 6 ++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/services_discovery/upnp-wrapper.cpp b/modules/services_discovery/upnp-wrapper.cpp index 9bdeebc007..d5fa2b1857 100644 --- a/modules/services_discovery/upnp-wrapper.cpp +++ b/modules/services_discovery/upnp-wrapper.cpp @@ -24,6 +24,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <vlc_common.h> + #include "upnp-wrapper.hpp" UpnpInstanceWrapper* UpnpInstanceWrapper::s_instance; diff --git a/modules/services_discovery/upnp-wrapper.hpp b/modules/services_discovery/upnp-wrapper.hpp index 33412cb993..ebae8fc96f 100644 --- a/modules/services_discovery/upnp-wrapper.hpp +++ b/modules/services_discovery/upnp-wrapper.hpp @@ -24,9 +24,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include <vlc_charset.h> #include <memory> #include <vector> @@ -36,9 +34,6 @@ #include <upnp/upnp.h> #include <upnp/upnptools.h> -#include <vlc_common.h> -#include <vlc_charset.h> - #if UPNP_VERSION < 10800 typedef void* UpnpEventPtr; #else diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp index 9b78150363..6708ca75f6 100644 --- a/modules/services_discovery/upnp.cpp +++ b/modules/services_discovery/upnp.cpp @@ -24,6 +24,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <vlc_common.h> + #include "upnp.hpp" #include <vlc_access.h> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
