diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-22 12:10:50 +0200 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-10-22 12:10:50 +0200 |
commit | 2bfd3a6ab2cdcc72d6918624ceaba6ed4d263771 (patch) | |
tree | 7f1928bc2e6b433e31c6239ad53882ef2185bf59 /src | |
parent | 989c67cea49ecefc974e3cf21d227ffc17d35d07 (diff) |
[[noreturn]] instead of ATTR_NORETURN (nw)
Diffstat (limited to 'src')
-rw-r--r-- | src/devices/cpu/m68000/m68kmake.cpp | 10 | ||||
-rw-r--r-- | src/emu/emucore.h | 4 | ||||
-rw-r--r-- | src/osd/osdcomm.h | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/devices/cpu/m68000/m68kmake.cpp b/src/devices/cpu/m68000/m68kmake.cpp index 8f29784a018..06e5cdecb1d 100644 --- a/src/devices/cpu/m68000/m68kmake.cpp +++ b/src/devices/cpu/m68000/m68kmake.cpp @@ -67,14 +67,8 @@ static const char g_version[] = "4.90"; #if defined(__GNUC__) && (__GNUC__ >= 3) #define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y))) -#define ATTR_NORETURN __attribute__((noreturn)) #else #define ATTR_PRINTF(x,y) -#if defined(_MSC_VER) -#define ATTR_NORETURN __declspec(noreturn) -#else -#define ATTR_NORETURN -#endif #endif #define M68K_MAX_PATH 1024 @@ -223,8 +217,8 @@ struct replace_struct /* Function Prototypes */ -static void ATTR_NORETURN error_exit(const char* fmt, ...) ATTR_PRINTF(1,2); -static void ATTR_NORETURN perror_exit(const char* fmt, ...) ATTR_PRINTF(1,2); +[[noreturn]] static void error_exit(const char* fmt, ...) ATTR_PRINTF(1,2); +[[noreturn]] static void perror_exit(const char* fmt, ...) ATTR_PRINTF(1,2); static int check_strsncpy(char* dst, char* src, int maxlength); static int check_atoi(char* str, int *result); static int skip_spaces(char* str); diff --git a/src/emu/emucore.h b/src/emu/emucore.h index 7aadaa170a5..cf4d77acd27 100644 --- a/src/emu/emucore.h +++ b/src/emu/emucore.h @@ -371,8 +371,8 @@ enum_value(T value) noexcept // FUNCTION PROTOTYPES //************************************************************************** -ATTR_NORETURN void fatalerror(const char *format, ...) ATTR_PRINTF(1,2); -ATTR_NORETURN void fatalerror_exitcode(running_machine &machine, int exitcode, const char *format, ...) ATTR_PRINTF(3,4); +[[noreturn]] void fatalerror(const char *format, ...) ATTR_PRINTF(1,2); +[[noreturn]] void fatalerror_exitcode(running_machine &machine, int exitcode, const char *format, ...) ATTR_PRINTF(3,4); //************************************************************************** // INLINE FUNCTIONS diff --git a/src/osd/osdcomm.h b/src/osd/osdcomm.h index 0898448a364..814f77e73cd 100644 --- a/src/osd/osdcomm.h +++ b/src/osd/osdcomm.h @@ -33,7 +33,6 @@ /* Some optimizations/warnings cleanups for GCC */ #if defined(__GNUC__) #define ATTR_UNUSED __attribute__((__unused__)) -#define ATTR_NORETURN __attribute__((noreturn)) #define ATTR_PRINTF(x,y) __attribute__((format(printf, x, y))) #define ATTR_CONST __attribute__((const)) #define ATTR_FORCE_INLINE __attribute__((always_inline)) @@ -44,7 +43,6 @@ #define RESTRICT __restrict__ #else #define ATTR_UNUSED -#define ATTR_NORETURN __declspec(noreturn) #define ATTR_PRINTF(x,y) #define ATTR_CONST #define ATTR_FORCE_INLINE __forceinline |