Rename LIBVLC_* function attributes to VLC_* within plugin API

include/vlc_access.h

@@ -151,7 +151,7 @@ static inline void access_InitFields( access_t *p_a )
  * This function will return the parent input of this access.
  * It is retained. It can return NULL.
  */
-VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) LIBVLC_USED;
+VLC_API input_thread_t * access_GetParentInput( access_t *p_access ) VLC_USED;
 
 #define ACCESS_SET_CALLBACKS( read, block, control, seek )              \
     p_access->pf_read = read;                                           \

include/vlc_acl.h

@@ -27,9 +27,9 @@
 
 
 VLC_API int ACL_Check( vlc_acl_t *p_acl, const char *psz_ip );
-VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) VLC_USED VLC_MALLOC;
 #define ACL_Create(a, b) ACL_Create(VLC_OBJECT(a), b)
-VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED LIBVLC_MALLOC;
+VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) VLC_USED VLC_MALLOC;
 #define ACL_Duplicate(a,b) ACL_Duplicate(VLC_OBJECT(a),b)
 VLC_API void ACL_Destroy( vlc_acl_t *p_acl );
 

include/vlc_aout.h

@@ -256,7 +256,7 @@ static const uint32_t pi_vlc_chan_order_wg4[] =
  * Prototypes
  *****************************************************************************/
 
-VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) LIBVLC_USED;
+VLC_API aout_buffer_t * aout_OutputNextBuffer( aout_instance_t *, mtime_t, bool ) VLC_USED;
 
 /**
  * This function computes the reordering needed to go from pi_chan_order_in to
@@ -300,13 +300,13 @@ static inline unsigned aout_FormatNbChannels(const audio_sample_format_t *fmt)
     return popcount(fmt->i_physical_channels & AOUT_CHAN_PHYSMASK);
 }
 
-VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) LIBVLC_USED;
+VLC_API unsigned int aout_BitsPerSample( vlc_fourcc_t i_format ) VLC_USED;
 VLC_API void aout_FormatPrepare( audio_sample_format_t * p_format );
 VLC_API void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format );
-VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) LIBVLC_USED;
+VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED;
 
-VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) LIBVLC_USED;
-VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) LIBVLC_USED;
+VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) VLC_USED;
+VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) VLC_USED;
 
 /* From intf.c : */
 VLC_API void aout_VolumeSoftInit( aout_instance_t * );
@@ -330,7 +330,7 @@ VLC_API void aout_EnableFilter(vlc_object_t *, const char *, bool );
         aout_EnableFilter( VLC_OBJECT(o), n, b )
 
 /* */
-VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) LIBVLC_USED;
+VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt ) VLC_USED;
 
 # ifdef __cplusplus
 }

include/vlc_block.h

@@ -137,12 +137,12 @@ struct block_t
  * - block_Duplicate : create a copy of a block.
  ****************************************************************************/
 VLC_API void block_Init( block_t *, void *, size_t );
-VLC_API block_t * block_Alloc( size_t ) LIBVLC_USED;
-VLC_API block_t * block_Realloc( block_t *, ssize_t i_pre, size_t i_body ) LIBVLC_USED;
+VLC_API block_t * block_Alloc( size_t ) VLC_USED;
+VLC_API block_t * block_Realloc( block_t *, ssize_t i_pre, size_t i_body ) VLC_USED;
 
 #define block_New( dummy, size ) block_Alloc(size)
 
-LIBVLC_USED
+VLC_USED
 static inline block_t *block_Duplicate( block_t *p_block )
 {
     block_t *p_dup = block_Alloc( p_block->i_buffer );
@@ -165,9 +165,9 @@ static inline void block_Release( block_t *p_block )
     p_block->pf_release( p_block );
 }
 
-VLC_API block_t * block_heap_Alloc(void *, void *, size_t) LIBVLC_USED;
-VLC_API block_t * block_mmap_Alloc(void *addr, size_t length) LIBVLC_USED;
-VLC_API block_t * block_File(int fd) LIBVLC_USED;
+VLC_API block_t * block_heap_Alloc(void *, void *, size_t) VLC_USED;
+VLC_API block_t * block_mmap_Alloc(void *addr, size_t length) VLC_USED;
+VLC_API block_t * block_File(int fd) VLC_USED;
 
 static inline void block_Cleanup (void *block)
 {
@@ -306,15 +306,15 @@ static inline block_t *block_ChainGather( block_t *p_list )
  * block_FifoGet and block_FifoShow are cancellation points.
  ****************************************************************************/
 
-VLC_API block_fifo_t * block_FifoNew( void ) LIBVLC_USED;
+VLC_API block_fifo_t * block_FifoNew( void ) VLC_USED;
 VLC_API void block_FifoRelease( block_fifo_t * );
 VLC_API void block_FifoPace( block_fifo_t *fifo, size_t max_depth, size_t max_size );
 VLC_API void block_FifoEmpty( block_fifo_t * );
 VLC_API size_t block_FifoPut( block_fifo_t *, block_t * );
 VLC_API void block_FifoWake( block_fifo_t * );
-VLC_API block_t * block_FifoGet( block_fifo_t * ) LIBVLC_USED;
+VLC_API block_t * block_FifoGet( block_fifo_t * ) VLC_USED;
 VLC_API block_t * block_FifoShow( block_fifo_t * );
-size_t block_FifoSize( const block_fifo_t *p_fifo ) LIBVLC_USED;
-VLC_API size_t block_FifoCount( const block_fifo_t *p_fifo ) LIBVLC_USED;
+size_t block_FifoSize( const block_fifo_t *p_fifo ) VLC_USED;
+VLC_API size_t block_FifoCount( const block_fifo_t *p_fifo ) VLC_USED;
 
 #endif /* VLC_BLOCK_H */

include/vlc_block_helper.h

@@ -37,7 +37,7 @@ typedef struct block_bytestream_t
 /*****************************************************************************
  * block_bytestream_t management
  *****************************************************************************/
-LIBVLC_USED
+VLC_USED
 static inline block_bytestream_t block_BytestreamInit( void )
 {
     block_bytestream_t bytestream;
@@ -101,7 +101,7 @@ static inline void block_BytestreamPush( block_bytestream_t *p_bytestream,
     if( !p_bytestream->p_block ) p_bytestream->p_block = p_block;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline block_t *block_BytestreamPop( block_bytestream_t *p_bytestream )
 {
     block_t *p_block;

include/vlc_charset.h

@@ -32,27 +32,27 @@
 
 /* iconv wrappers (defined in src/extras/libc.c) */
 typedef void *vlc_iconv_t;
-VLC_API vlc_iconv_t vlc_iconv_open( const char *, const char * ) LIBVLC_USED;
-VLC_API size_t vlc_iconv( vlc_iconv_t, const char **, size_t *, char **, size_t * ) LIBVLC_USED;
+VLC_API vlc_iconv_t vlc_iconv_open( const char *, const char * ) VLC_USED;
+VLC_API size_t vlc_iconv( vlc_iconv_t, const char **, size_t *, char **, size_t * ) VLC_USED;
 VLC_API int vlc_iconv_close( vlc_iconv_t );
 
 #include <stdarg.h>
 
 VLC_API void LocaleFree( const char * );
-VLC_API char * FromLocale( const char * ) LIBVLC_USED;
-VLC_API char * FromLocaleDup( const char * ) LIBVLC_USED;
-VLC_API char * ToLocale( const char * ) LIBVLC_USED;
-VLC_API char * ToLocaleDup( const char * ) LIBVLC_USED;
+VLC_API char * FromLocale( const char * ) VLC_USED;
+VLC_API char * FromLocaleDup( const char * ) VLC_USED;
+VLC_API char * ToLocale( const char * ) VLC_USED;
+VLC_API char * ToLocaleDup( const char * ) VLC_USED;
 
 VLC_API int utf8_vfprintf( FILE *stream, const char *fmt, va_list ap );
-VLC_API int utf8_fprintf( FILE *, const char *, ... ) LIBVLC_FORMAT( 2, 3 );
-VLC_API char * vlc_strcasestr(const char *, const char *) LIBVLC_USED;
+VLC_API int utf8_fprintf( FILE *, const char *, ... ) VLC_FORMAT( 2, 3 );
+VLC_API char * vlc_strcasestr(const char *, const char *) VLC_USED;
 
 VLC_API char * EnsureUTF8( char * );
-VLC_API const char * IsUTF8( const char * ) LIBVLC_USED;
+VLC_API const char * IsUTF8( const char * ) VLC_USED;
 
 #ifdef WIN32
-LIBVLC_USED
+VLC_USED
 static inline char *FromWide (const wchar_t *wide)
 {
     size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
@@ -66,7 +66,7 @@ static inline char *FromWide (const wchar_t *wide)
     return out;
 }
 
-LIBVLC_USED
+VLC_USED
 static inline wchar_t *ToWide (const char *utf8)
 {
     int len = MultiByteToWideChar (CP_UTF8, 0, utf8, -1, NULL, 0);
@@ -108,13 +108,13 @@ static inline char *FromLatin1 (const char *latin)
     return utf8 ? utf8 : str;
 }
 
-VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) LIBVLC_USED;
-VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) LIBVLC_USED;
+VLC_API char * FromCharset( const char *charset, const void *data, size_t data_size ) VLC_USED;
+VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize ) VLC_USED;
 
-VLC_API double us_strtod( const char *, char ** ) LIBVLC_USED;
-VLC_API float us_strtof( const char *, char ** ) LIBVLC_USED;
-VLC_API double us_atof( const char * ) LIBVLC_USED;
+VLC_API double us_strtod( const char *, char ** ) VLC_USED;
+VLC_API float us_strtof( const char *, char ** ) VLC_USED;
+VLC_API double us_atof( const char * ) VLC_USED;
 VLC_API int us_vasprintf( char **, const char *, va_list );
-VLC_API int us_asprintf( char **, const char *, ... ) LIBVLC_USED;
+VLC_API int us_asprintf( char **, const char *, ... ) VLC_USED;
 
 #endif

include/vlc_codec.h

@@ -180,7 +180,7 @@ struct encoder_t
  * buffer. You have to release it using decoder_DeletePicture or by returning
  * it to the caller as a pf_decode_video return value.
  */
-VLC_API picture_t * decoder_NewPicture( decoder_t * ) LIBVLC_USED;
+VLC_API picture_t * decoder_NewPicture( decoder_t * ) VLC_USED;
 
 /**
  * This function will release a picture create by decoder_NewPicture.
@@ -204,7 +204,7 @@ VLC_API void decoder_UnlinkPicture( decoder_t *, picture_t * );
  * output buffer. You have to release it using decoder_DeleteAudioBuffer
  * or by returning it to the caller as a pf_decode_audio return value.
  */
-VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) LIBVLC_USED;
+VLC_API aout_buffer_t * decoder_NewAudioBuffer( decoder_t *, int i_size ) VLC_USED;
 
 /**
  * This function will release a audio buffer created by decoder_NewAudioBuffer.
@@ -216,7 +216,7 @@ VLC_API void decoder_DeleteAudioBuffer( decoder_t *, aout_buffer_t *p_buffer );
  * buffer. You have to release it using decoder_DeleteSubpicture or by returning
  * it to the caller as a pf_decode_sub return value.
  */
-VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) LIBVLC_USED;
+VLC_API subpicture_t * decoder_NewSubpicture( decoder_t *, const subpicture_updater_t * ) VLC_USED;
 
 /**
  * This function will release a subpicture created by decoder_NewSubicture.
@@ -235,12 +235,12 @@ VLC_API int decoder_GetInputAttachments( decoder_t *, input_attachment_t ***ppp_
  * to mdate().
  * You MUST use it *only* for gathering statistics about speed.
  */
-VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) LIBVLC_USED;
+VLC_API mtime_t decoder_GetDisplayDate( decoder_t *, mtime_t ) VLC_USED;
 
 /**
  * This function returns the current input rate.
  * You MUST use it *only* for gathering statistics about speed.
  */
-VLC_API int decoder_GetDisplayRate( decoder_t * ) LIBVLC_USED;
+VLC_API int decoder_GetDisplayRate( decoder_t * ) VLC_USED;
 
 #endif /* _VLC_CODEC_H */

include/vlc_codec_synchro.h

@@ -37,13 +37,13 @@
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) LIBVLC_USED;
+VLC_API decoder_synchro_t * decoder_SynchroInit( decoder_t *, int ) VLC_USED;
 VLC_API void decoder_SynchroRelease( decoder_synchro_t * );
 VLC_API void decoder_SynchroReset( decoder_synchro_t * );
 VLC_API bool decoder_SynchroChoose( decoder_synchro_t *, int, int, bool );
 VLC_API void decoder_SynchroTrash( decoder_synchro_t * );
 VLC_API void decoder_SynchroDecode( decoder_synchro_t * );
 VLC_API void decoder_SynchroEnd( decoder_synchro_t *, int, bool );
-VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) LIBVLC_USED;
+VLC_API mtime_t decoder_SynchroDate( decoder_synchro_t * ) VLC_USED;
 VLC_API void decoder_SynchroNewPicture( decoder_synchro_t *, int, int, mtime_t, mtime_t, bool );