summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJamey Sharp <jamey@minilop.net>2010-05-21 22:16:50 -0700
committerKeith Packard <keithp@keithp.com>2010-05-22 01:00:04 -0700
commite90f20eed394de2200aba42bd61fd31c1067ac33 (patch)
treed1abc51e4a69a990289cb0293e9a5a1b83538ffe /include
parent9d31d5b639c2a6ab8b1a80a0e2f0ee2c4f8cddd3 (diff)
Declare functions that unconditionally call FatalError as _X_NORETURN.
For AtomError, this should fix a clang warning; in the other cases it's just good documentation. Signed-off-by: Jamey Sharp <jamey@minilop.net> Cc: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'include')
-rw-r--r--include/dix.h2
-rw-r--r--include/dixstruct.h2
-rw-r--r--include/extnsionst.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/dix.h b/include/dix.h
index 893338f14..3d09bbe13 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -300,7 +300,7 @@ extern _X_EXPORT Bool ValidAtom(
extern _X_EXPORT const char *NameForAtom(
Atom /*atom*/);
-extern _X_EXPORT void AtomError(void);
+extern _X_EXPORT void AtomError(void) _X_NORETURN;
extern _X_EXPORT void FreeAllAtoms(void);
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 5b1a6981d..96104275d 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -53,7 +53,7 @@ typedef void (*ReplySwapPtr) (
extern _X_EXPORT void ReplyNotSwappd (
ClientPtr /* pClient */,
int /* size */,
- void * /* pbuf */);
+ void * /* pbuf */) _X_NORETURN;
typedef enum {ClientStateInitial,
ClientStateAuthenticating,
diff --git a/include/extnsionst.h b/include/extnsionst.h
index 19c76fcc4..bb66dfb6e 100644
--- a/include/extnsionst.h
+++ b/include/extnsionst.h
@@ -84,7 +84,7 @@ extern _X_EXPORT EventSwapPtr EventSwapVector[128];
extern _X_EXPORT void NotImplemented ( /* FIXME: this may move to another file... */
xEvent *,
- xEvent *);
+ xEvent *) _X_NORETURN;
#define SetGCVector(pGC, VectorElement, NewRoutineAddress, Atom) \
pGC->VectorElement = NewRoutineAddress;