diff options
| author | Keith Packard <keithp@keithp.com> | 2010-05-12 16:48:08 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-05-12 16:48:08 -0700 |
| commit | 59857ee5da5f1f3f4900292581b9586477513211 (patch) | |
| tree | 5155d9b62953768fc645573c78ca0fae8438bdaa /include | |
| parent | 21ceae9002c6364deb3d074cf2da7d3864cf6879 (diff) | |
| parent | 432cbbec194e47bf2a117c9302146e786c8a4ee1 (diff) | |
Merge remote branch 'dottedmag/for-keithp'
Diffstat (limited to 'include')
| -rw-r--r-- | include/misc.h | 6 | ||||
| -rw-r--r-- | include/os.h | 7 |
2 files changed, 8 insertions, 5 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..d34e056ed 100644 --- a/include/os.h +++ b/include/os.h @@ -299,7 +299,7 @@ extern _X_EXPORT void OsBlockSignals (void); extern _X_EXPORT void OsReleaseSignals (void); -extern _X_EXPORT void OsAbort (void); +extern _X_EXPORT void OsAbort (void) X_NORETURN; #if !defined(WIN32) extern _X_EXPORT int System(char *); @@ -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 |