Commit 3df02ef0 authored by Rémi Duraffort's avatar Rémi Duraffort

Fix make check.

parent 5fff8a35
...@@ -810,8 +810,6 @@ VLC_EXPORT( void *, vlc_memalign, ( void **base, size_t alignment, size_t size ) ...@@ -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 ); 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) #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 */ /* Fast large memory copy and memory set */
VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) ); VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) );
VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) ); VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
......
...@@ -241,7 +241,6 @@ int vlc_poll (struct pollfd *, unsigned, int); ...@@ -241,7 +241,6 @@ int vlc_poll (struct pollfd *, unsigned, int);
#endif #endif
#ifndef HAVE_SEARCH_H #ifndef HAVE_SEARCH_H
typedef struct entry { typedef struct entry {
char *key; char *key;
void *data; void *data;
...@@ -258,24 +257,14 @@ typedef enum { ...@@ -258,24 +257,14 @@ typedef enum {
leaf leaf
} VISIT; } 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 *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 *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 *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 twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) );
void tdestroy( void *root, void (*free_node)(void *nodep) ); void tdestroy( void *root, void (*free_node)(void *nodep) );
#endif #else // HAVE_SEARCH_H
# ifndef HAVE_TDESTROY
#ifndef HAVE_TDESTROY void tdestroy( void *root, void (*free_node)(void *nodep) );
// If search.h is not present we are already building tdestroy
# ifdef HAVE_SEARCH_H
# define tdestroy vlc_tdestroy
# endif # endif
#endif #endif
......
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