[vlc-commits] ASF: macro removal in ASF_CountObject

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jan 10 18:05:26 2012 +0100| [137d008bc73efbd9c8275faf7f1b2af13d426f2a] | committer: Jean-Baptiste Kempf

ASF: macro removal in ASF_CountObject

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=137d008bc73efbd9c8275faf7f1b2af13d426f2a
---

 modules/demux/asf/libasf.c |    5 +++--
 modules/demux/asf/libasf.h |    3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index 245edd9..e91f195 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -1583,11 +1583,12 @@ void ASF_FreeObjectRoot( stream_t *s, asf_object_root_t *p_root )
     free( p_root );
 }
 
-int  __ASF_CountObject( asf_object_t *p_obj, const guid_t *p_guid )
+int ASF_CountObject( void *_p_obj, const guid_t *p_guid )
 {
     int i_count;
-    asf_object_t *p_child;
+    asf_object_t *p_child, *p_obj;
 
+    p_obj = (asf_object_t *)_p_obj;
     if( !p_obj )
         return 0;
 
diff --git a/modules/demux/asf/libasf.h b/modules/demux/asf/libasf.h
index 8481ccb..91d0e45 100644
--- a/modules/demux/asf/libasf.h
+++ b/modules/demux/asf/libasf.h
@@ -359,8 +359,7 @@ typedef union asf_object_u
 asf_object_root_t *ASF_ReadObjectRoot( stream_t *, int b_seekable );
 void               ASF_FreeObjectRoot( stream_t *, asf_object_root_t *p_root );
 
-#define ASF_CountObject( a, b ) __ASF_CountObject( (asf_object_t*)(a), b )
-int  __ASF_CountObject ( asf_object_t *p_obj, const guid_t *p_guid );
+int ASF_CountObject ( void *p_obj, const guid_t *p_guid );
 
 #define ASF_FindObject( a, b, c )  __ASF_FindObject( (asf_object_t*)(a), b, c )
 void *__ASF_FindObject( asf_object_t *p_obj, const guid_t *p_guid, int i_number );