Remove VLC_NORETURN, use standard syntax

Now this works not only on GCC.
This commit is contained in:
Rémi Denis-Courmont 2017-02-18 12:20:19 +02:00
parent 40b946f215
commit 57b80197dd
6 changed files with 10 additions and 12 deletions

View File

@ -92,7 +92,6 @@
# define VLC_FORMAT_ARG(x) __attribute__ ((format_arg(x)))
# define VLC_MALLOC __attribute__ ((malloc))
# define VLC_NORETURN __attribute__ ((noreturn))
# if VLC_GCC_VERSION(3,4)
# define VLC_USED __attribute__ ((warn_unused_result))
@ -105,7 +104,6 @@
# define VLC_FORMAT(x,y)
# define VLC_FORMAT_ARG(x)
# define VLC_MALLOC
# define VLC_NORETURN
# define VLC_USED
#endif

View File

@ -34,6 +34,7 @@
#include <errno.h>
#include <assert.h>
#include <stdnoreturn.h>
#include <sys/types.h>
#include <unistd.h>
@ -1598,8 +1599,7 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type )
return -1;
}
VLC_NORETURN
static void *KeepAliveThread( void *p_data )
noreturn static void *KeepAliveThread( void *p_data )
{
access_t *p_access = p_data;

View File

@ -36,6 +36,7 @@
#include <vlc_network.h>
#include <assert.h>
#include <stdnoreturn.h>
#include <unistd.h>
/************************************************************************
@ -205,8 +206,7 @@ static void Close( vlc_object_t *p_this )
/*****************************************************************************
* Run: main thread
*****************************************************************************/
VLC_NORETURN
static void *Run( void *data )
noreturn static void *Run( void *data )
{
services_discovery_t *p_sd = data;
services_discovery_sys_t *p_sys = p_sd->p_sys;

View File

@ -22,6 +22,7 @@
# include "config.h"
#endif
#include <stdnoreturn.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
@ -49,8 +50,7 @@ struct vlc_timer
atomic_uint overruns;
};
VLC_NORETURN
static void *vlc_timer_thread (void *data)
noreturn static void *vlc_timer_thread (void *data)
{
struct vlc_timer *timer = data;

View File

@ -28,6 +28,7 @@
#include <vlc_common.h>
#include <stdnoreturn.h>
#include <stdlib.h> /* free() */
#include <stdio.h> /* sprintf() */
#include <string.h>
@ -130,8 +131,7 @@ static void AddressDestroy (sap_address_t *addr)
* \param p_this the SAP Handler object
* \return nothing
*/
VLC_NORETURN
static void *RunThread (void *self)
noreturn static void *RunThread (void *self)
{
sap_address_t *addr = self;

View File

@ -28,6 +28,7 @@
# include "config.h"
#endif
#include <assert.h>
#include <stdnoreturn.h>
#include <vlc_common.h>
#include <vlc_video_splitter.h>
@ -599,8 +600,7 @@ static void VoutDisplayEventMouse(vout_display_t *vd, int event, va_list args)
vlc_mutex_unlock(&osys->lock);
}
VLC_NORETURN
static void *VoutDisplayEventKeyDispatch(void *data)
noreturn static void *VoutDisplayEventKeyDispatch(void *data)
{
vout_display_owner_sys_t *osys = data;