aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/dix.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-23 10:42:19 +0000
committermarha <marha@users.sourceforge.net>2010-05-23 10:42:19 +0000
commit77f85e3c78dda5d9c3db617426f929144890c03f (patch)
tree859e5cdda5ba4b7a53a6c51e0c824a4fb4fa46ae /xorg-server/include/dix.h
parent8b1228fdd95f63ae5ed6f80597eafc973fc5bf57 (diff)
parent23e2ddeb0f81d5ee9c6d01cf0b768eeb1c27555c (diff)
downloadvcxsrv-77f85e3c78dda5d9c3db617426f929144890c03f.tar.gz
vcxsrv-77f85e3c78dda5d9c3db617426f929144890c03f.tar.bz2
vcxsrv-77f85e3c78dda5d9c3db617426f929144890c03f.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/dix.h')
-rw-r--r--xorg-server/include/dix.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 7fe4407e3..254ddb3f4 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/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);