diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-02-17 23:11:49 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-02-17 23:11:49 +0000 |
| commit | b4f663a29bc1c9168108538d27c427a58c593668 (patch) | |
| tree | 6507c1b3f0ac0ace859a109a49addbf4bc1f9c26 /epan/except.h | |
| parent | dae52000024e82dbb5ca4d1cf573b95d9a831330 (diff) | |
| download | wireshark-b4f663a29bc1c9168108538d27c427a58c593668.tar.gz wireshark-b4f663a29bc1c9168108538d27c427a58c593668.tar.bz2 wireshark-b4f663a29bc1c9168108538d27c427a58c593668.zip | |
On Windows, try putting __declspec(noreturn) in front of declarations of
routines that don't return. (This requires that some files include
config.h to get WS_MSVC_NORETURN declared properly.)
svn path=/trunk/; revision=35989
Diffstat (limited to 'epan/except.h')
| -rw-r--r-- | epan/except.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/epan/except.h b/epan/except.h index f648806a20..16ee729a1d 100644 --- a/epan/except.h +++ b/epan/except.h @@ -90,18 +90,13 @@ extern void except_setup_try(struct except_stacknode *, struct except_catch *, const except_id_t [], size_t); extern struct except_stacknode *except_pop(void); -/* - * XXX - is there some way to annotate the G_GNUC_NORETURN functions - * usint the Standard Annotation Language so that Microsoft's static - * code analyzer knows they never return? - */ /* public interface functions */ extern int except_init(void); extern void except_deinit(void); -extern void except_rethrow(except_t *) G_GNUC_NORETURN; -extern void except_throw(long, long, const char *) G_GNUC_NORETURN; -extern void except_throwd(long, long, const char *, void *) G_GNUC_NORETURN; -extern void except_throwf(long, long, const char *, ...) G_GNUC_NORETURN; +extern void WS_MSVC_NORETURN except_rethrow(except_t *) G_GNUC_NORETURN; +extern void WS_MSVC_NORETURN except_throw(long, long, const char *) G_GNUC_NORETURN; +extern void WS_MSVC_NORETURN except_throwd(long, long, const char *, void *) G_GNUC_NORETURN; +extern void WS_MSVC_NORETURN except_throwf(long, long, const char *, ...) G_GNUC_NORETURN; extern void (*except_unhandled_catcher(void (*)(except_t *)))(except_t *); extern unsigned long except_code(except_t *); extern unsigned long except_group(except_t *); |