[vlc-commits] access init macros: C++ compatibility

Rafaël Carré git at videolan.org
Fri Jun 20 17:11:56 CEST 2014


vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jun 19 11:22:23 2014 +0200| [27f47992199b495bded8970a449336db0824d533] | committer: Jean-Baptiste Kempf

access init macros: C++ compatibility

(cherry picked from commit 0213b4e2062ab3dc3da965ead12867ee9bc30572)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=27f47992199b495bded8970a449336db0824d533
---

 include/vlc_access.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_access.h b/include/vlc_access.h
index 8a8f1fa..511278a 100644
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -162,7 +162,7 @@ VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
     do { \
         access_InitFields( p_access ); \
         ACCESS_SET_CALLBACKS( Read, NULL, Control, Seek ); \
-        p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) ); \
+        p_sys = p_access->p_sys = (access_sys_t*)calloc( 1, sizeof( access_sys_t ) ); \
         if( !p_sys ) return VLC_ENOMEM;\
     } while(0);
 
@@ -170,7 +170,7 @@ VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
     do { \
         access_InitFields( p_access ); \
         ACCESS_SET_CALLBACKS( NULL, Block, Control, Seek ); \
-        p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ) ); \
+        p_sys = p_access->p_sys = (access_sys_t*)calloc( 1, sizeof( access_sys_t ) ); \
         if( !p_sys ) return VLC_ENOMEM; \
     } while(0);
 



More information about the vlc-commits mailing list