diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 01:59:06 +0700 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-05-13 04:54:34 +0700 |
| commit | 868e372a73b377705217e0379bc6e00f36c4d8e5 (patch) | |
| tree | b1d00d5abc7401baac8b41fb4893bd75dbedd2f7 /include | |
| parent | 5a8e2f2745ae1f74501cd3f42614a1ed2cf974f2 (diff) | |
Introduce X_NORETURN macro defined as __attribute__((noreturn)) for gcc
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/misc.h | 6 | ||||
| -rw-r--r-- | include/os.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/misc.h b/include/misc.h index c7add253e..e4bdee480 100644 --- a/include/misc.h +++ b/include/misc.h @@ -106,6 +106,12 @@ typedef unsigned long ATOM; #define X_DEPRECATED #endif +#if defined(__GNUC__) && (__GNUC__ > 2) +#define X_NORETURN __attribute__((noreturn)) +#else +#define X_NORETURN +#endif + #ifndef _XTYPEDEF_CALLBACKLISTPTR typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */ #define _XTYPEDEF_CALLBACKLISTPTR diff --git a/include/os.h b/include/os.h index 7f358eeaf..82d6694c2 100644 --- a/include/os.h +++ b/include/os.h @@ -547,10 +547,7 @@ extern _X_EXPORT void FreeAuditTimer(void); extern _X_EXPORT void AuditF(const char *f, ...) _printf_attribute(1,2); extern _X_EXPORT void VAuditF(const char *f, va_list args); extern _X_EXPORT void FatalError(const char *f, ...) _printf_attribute(1,2) -#if defined(__GNUC__) && (__GNUC__ > 2) -__attribute((noreturn)) -#endif -; + X_NORETURN; #ifdef DEBUG #define DebugF ErrorF |