xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Sat May 22 01:04:47 PDT 2010
include/dix.h | 2 +-
include/dixstruct.h | 2 +-
include/extnsionst.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e90f20eed394de2200aba42bd61fd31c1067ac33
Author: Jamey Sharp <jamey at minilop.net>
Date: Fri May 21 22:16:50 2010 -0700
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 at minilop.net>
Cc: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/include/dix.h b/include/dix.h
index 893338f..3d09bbe 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 5b1a698..9610427 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 19c76fc..bb66dfb 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;
More information about the xorg-commit
mailing list