vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Jan 31 12:53:38 2012 +0100| [b7c491588e1e692b80a11b81b029d56618a555ab] | committer: Jean-Baptiste Kempf
Skins: fix compilation with zlib 1.2.6 Close #5964 (cherry picked from commit 18173044cdaa1fce6652614b893054d792f4e258) Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit f7f2bcae94482df5b4aabed309160fc02ad20b24) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=b7c491588e1e692b80a11b81b029d56618a555ab --- modules/gui/skins2/src/theme_loader.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp index db535f5..d550da3 100644 --- a/modules/gui/skins2/src/theme_loader.cpp +++ b/modules/gui/skins2/src/theme_loader.cpp @@ -768,7 +768,7 @@ int gzclose_frontend( int fd ) { void *toClose = currentGzVp; currentGzVp = NULL; currentGzFd = -1; - return gzclose( toClose ); + return gzclose( (gzFile) toClose ); } return -1; } @@ -777,7 +777,7 @@ int gzread_frontend( int fd, void *p_buffer, size_t i_length ) { if( currentGzVp != NULL && fd != -1 ) { - return gzread( currentGzVp, p_buffer, i_length ); + return gzread( (gzFile) currentGzVp, p_buffer, i_length ); } return -1; } @@ -786,7 +786,7 @@ int gzwrite_frontend( int fd, const void * p_buffer, size_t i_length ) { if( currentGzVp != NULL && fd != -1 ) { - return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length ); + return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length ); } return -1; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
