Commit e4c0e92a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

vlc_.*dir: declare internally, as it's only used with libvlc

parent 0b3174ed
......@@ -129,28 +129,6 @@ static inline struct tm *gmtime_r (const time_t *timep, struct tm *result)
}
#endif
#ifndef HAVE_DIRENT_H
typedef void DIR;
# ifndef FILENAME_MAX
# define FILENAME_MAX (260)
# endif
struct dirent
{
long d_ino; /* Always zero. */
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
char d_name[FILENAME_MAX]; /* File name. */
};
# define opendir vlc_opendir
# define readdir vlc_readdir
# define closedir vlc_closedir
# define rewinddir vlc_rewindir
VLC_EXPORT( void *, vlc_opendir, ( const char * ) );
VLC_EXPORT( void *, vlc_readdir, ( void * ) );
VLC_EXPORT( int, vlc_closedir, ( void * ) );
VLC_INTERNAL( void, vlc_rewinddir, ( void * ) );
#endif
#ifndef HAVE_USELOCALE
typedef void *locale_t;
# define newlocale( a, b, c ) ((locale_t)0)
......
......@@ -252,4 +252,29 @@ extern const size_t libvlc_config_count;
*/
void var_OptionParse (vlc_object_t *, const char *, bool trusted);
/*
* Replacement functions
*/
# ifndef HAVE_DIRENT_H
typedef void DIR;
# ifndef FILENAME_MAX
# define FILENAME_MAX (260)
# endif
struct dirent
{
long d_ino; /* Always zero. */
unsigned short d_reclen; /* Always zero. */
unsigned short d_namlen; /* Length of name in d_name. */
char d_name[FILENAME_MAX]; /* File name. */
};
# define opendir vlc_opendir
# define readdir vlc_readdir
# define closedir vlc_closedir
# define rewinddir vlc_rewindir
void *vlc_opendir (const char *);
void *vlc_readdir (void *);
int vlc_closedir(void *);
void vlc_rewinddir(void *);
# endif
#endif
......@@ -379,7 +379,6 @@ vlc_b64_decode_binary_to_buffer
vlc_b64_encode
vlc_b64_encode_binary
VLC_Changeset
vlc_closedir
VLC_CompileBy
VLC_CompileDomain
VLC_CompileHost
......@@ -437,10 +436,8 @@ __vlc_object_unlock
__vlc_object_wait
__vlc_object_waitpipe
__vlc_object_yield
vlc_opendir
vlc_pthread_fatal
vlc_rand_bytes
vlc_readdir
vlc_recvmsg
vlc_scandir
vlc_sdp_Start
......
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