diff options
| -rw-r--r-- | include/misc.h | 6 | ||||
| -rw-r--r-- | include/os.h | 5 | ||||
| -rw-r--r-- | os/log.c | 5 |
3 files changed, 9 insertions, 7 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 @@ -402,9 +402,8 @@ LogMessage(MessageType type, const char *format, ...) va_end(ap); } -#ifdef __GNUC__ -void AbortServer(void) __attribute__((noreturn)); -#endif +void +AbortServer(void) X_NORETURN; void AbortServer(void) |