From e4c0e92a1f78b19caf0f13b02198b37b9f8144cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 24 May 2008 11:04:59 +0300 Subject: [PATCH] vlc_.*dir: declare internally, as it's only used with libvlc --- include/vlc_fixups.h | 22 ---------------------- src/libvlc.h | 25 +++++++++++++++++++++++++ src/libvlccore.sym | 3 --- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index 1da896e6ef..961aaa508e 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -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) diff --git a/src/libvlc.h b/src/libvlc.h index 34c6626b1f..93658ddf6e 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -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 diff --git a/src/libvlccore.sym b/src/libvlccore.sym index b24feb379a..88a80dead5 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -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 -- 2.39.5