Commit 27f47992 authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf

access init macros: C++ compatibility

(cherry picked from commit 0213b4e2062ab3dc3da965ead12867ee9bc30572)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent b1a0f263
...@@ -162,7 +162,7 @@ VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED; ...@@ -162,7 +162,7 @@ VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
do { \ do { \
access_InitFields( p_access ); \ access_InitFields( p_access ); \
ACCESS_SET_CALLBACKS( Read, NULL, Control, Seek ); \ 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;\ if( !p_sys ) return VLC_ENOMEM;\
} while(0); } while(0);
...@@ -170,7 +170,7 @@ VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED; ...@@ -170,7 +170,7 @@ VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
do { \ do { \
access_InitFields( p_access ); \ access_InitFields( p_access ); \
ACCESS_SET_CALLBACKS( NULL, Block, Control, Seek ); \ 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; \ if( !p_sys ) return VLC_ENOMEM; \
} while(0); } while(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment