vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Jun 10 21:35:02 2015 +0200| [1a29a30fc5689a7ec80cf561c53a109837f30d08] | committer: Francois Cartegnie
demux: hls: correctly ifdef gcrypt include > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a29a30fc5689a7ec80cf561c53a109837f30d08 --- modules/demux/hls/playlist/HLSSegment.cpp | 4 ---- modules/demux/hls/playlist/HLSSegment.hpp | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/demux/hls/playlist/HLSSegment.cpp b/modules/demux/hls/playlist/HLSSegment.cpp index ac2a48b..3dda79c 100644 --- a/modules/demux/hls/playlist/HLSSegment.cpp +++ b/modules/demux/hls/playlist/HLSSegment.cpp @@ -17,10 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "HLSSegment.hpp" #include <vlc_common.h> diff --git a/modules/demux/hls/playlist/HLSSegment.hpp b/modules/demux/hls/playlist/HLSSegment.hpp index ec5038e..49b89ab 100644 --- a/modules/demux/hls/playlist/HLSSegment.hpp +++ b/modules/demux/hls/playlist/HLSSegment.hpp @@ -20,9 +20,15 @@ #ifndef HLSSEGMENT_HPP #define HLSSEGMENT_HPP +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "../adaptative/playlist/Segment.h" #include <vector> -#include <gcrypt.h> +#ifdef HAVE_GCRYPT + #include <gcrypt.h> +#endif namespace hls { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
