vlc | branch: master | Rémi Duraffort <[email protected]> | Tue Dec 7 17:37:04 2010 +0100| [3df02ef034fc199814e66727e28802b935766653] | committer: Rémi Duraffort
Fix make check. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3df02ef034fc199814e66727e28802b935766653 --- include/vlc_common.h | 2 -- include/vlc_fixups.h | 17 +++-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index eb23f15..3e9de44 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -810,8 +810,6 @@ VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) VLC_EXPORT( int, vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const *pp_argv, char *const *pp_env, const char *psz_cwd, const char *p_in, size_t i_in, char **pp_data, size_t *pi_data ) LIBVLC_USED ); #define vlc_execve(a,b,c,d,e,f,g,h,i) vlc_execve(VLC_OBJECT(a),b,c,d,e,f,g,h,i) -VLC_EXPORT( void, vlc_tdestroy, ( void *, void (*)(void *) ) ); - /* Fast large memory copy and memory set */ VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) ); VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 601cf3b..6f6a6e7 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -241,7 +241,6 @@ int vlc_poll (struct pollfd *, unsigned, int); #endif #ifndef HAVE_SEARCH_H - typedef struct entry { char *key; void *data; @@ -258,24 +257,14 @@ typedef enum { leaf } VISIT; -#ifdef _SEARCH_PRIVATE -typedef struct node { - char *key; - struct node *llink, *rlink; -} node_t; -#endif - void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); void tdestroy( void *root, void (*free_node)(void *nodep) ); -#endif - -#ifndef HAVE_TDESTROY -// If search.h is not present we are already building tdestroy -# ifdef HAVE_SEARCH_H -# define tdestroy vlc_tdestroy +#else // HAVE_SEARCH_H +# ifndef HAVE_TDESTROY +void tdestroy( void *root, void (*free_node)(void *nodep) ); # endif #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
