diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/except.c | 10 | ||||
-rw-r--r-- | epan/except.h | 10 | ||||
-rw-r--r-- | epan/proto.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/epan/except.c b/epan/except.c index de6021c362..881796ebd8 100644 --- a/epan/except.c +++ b/epan/except.c @@ -180,7 +180,7 @@ static int match(const volatile except_id_t *thrown, const except_id_t *caught) return group_match && code_match; } -G_GNUC_NORETURN WS_MSVC_NORETURN static void do_throw(except_t *except) +WS_NORETURN static void do_throw(except_t *except) { struct except_stacknode *top; @@ -261,7 +261,7 @@ struct except_stacknode *except_pop(void) return top; } -G_GNUC_NORETURN WS_MSVC_NORETURN void except_rethrow(except_t *except) +WS_NORETURN void except_rethrow(except_t *except) { struct except_stacknode *top = get_top(); assert (top != 0); @@ -271,7 +271,7 @@ G_GNUC_NORETURN WS_MSVC_NORETURN void except_rethrow(except_t *except) do_throw(except); } -G_GNUC_NORETURN WS_MSVC_NORETURN void except_throw(long group, long code, const char *msg) +WS_NORETURN void except_throw(long group, long code, const char *msg) { except_t except; @@ -289,7 +289,7 @@ G_GNUC_NORETURN WS_MSVC_NORETURN void except_throw(long group, long code, const do_throw(&except); } -G_GNUC_NORETURN WS_MSVC_NORETURN void except_throwd(long group, long code, const char *msg, void *data) +WS_NORETURN void except_throwd(long group, long code, const char *msg, void *data) { except_t except; @@ -306,7 +306,7 @@ G_GNUC_NORETURN WS_MSVC_NORETURN void except_throwd(long group, long code, const * XCEPT_BUFFER_SIZE? We could then just use this to generate formatted * messages. */ -G_GNUC_NORETURN WS_MSVC_NORETURN void except_throwf(long group, long code, const char *fmt, ...) +WS_NORETURN void except_throwf(long group, long code, const char *fmt, ...) { char *buf = (char *)except_alloc(XCEPT_BUFFER_SIZE); va_list vl; diff --git a/epan/except.h b/epan/except.h index 063218274a..0f979637e9 100644 --- a/epan/except.h +++ b/epan/except.h @@ -92,11 +92,11 @@ WS_DLL_PUBLIC struct except_stacknode *except_pop(void); /* public interface functions */ WS_DLL_PUBLIC int except_init(void); WS_DLL_PUBLIC void except_deinit(void); -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_rethrow(except_t *) G_GNUC_NORETURN; -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_throw(long, long, const char *) G_GNUC_NORETURN; -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_throwd(long, long, const char *, void *) G_GNUC_NORETURN; -WS_DLL_PUBLIC WS_MSVC_NORETURN void except_throwf(long, long, const char *, ...) - G_GNUC_NORETURN G_GNUC_PRINTF(3, 4); +WS_DLL_PUBLIC WS_NORETURN void except_rethrow(except_t *); +WS_DLL_PUBLIC WS_NORETURN void except_throw(long, long, const char *); +WS_DLL_PUBLIC WS_NORETURN void except_throwd(long, long, const char *, void *); +WS_DLL_PUBLIC WS_NORETURN void except_throwf(long, long, const char *, ...) + G_GNUC_PRINTF(3, 4); WS_DLL_PUBLIC void (*except_unhandled_catcher(void (*)(except_t *)))(except_t *); extern unsigned long except_code(except_t *); extern unsigned long except_group(except_t *); diff --git a/epan/proto.h b/epan/proto.h index 7d6ce083c2..9119038dcf 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -120,7 +120,7 @@ typedef struct _protocol protocol_t; * * @param message string to use as the message */ -WS_DLL_PUBLIC WS_MSVC_NORETURN void proto_report_dissector_bug(const char *message) G_GNUC_NORETURN; +WS_DLL_PUBLIC WS_NORETURN void proto_report_dissector_bug(const char *message); #define REPORT_DISSECTOR_BUG(message) \ proto_report_dissector_bug(message) |