xserver: Branch 'server-1.10-branch'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Wed Jun 1 22:03:02 PDT 2011
include/privates.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6a16c4c268962fd09a52e4e78116aaa3bb1c47d5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Wed Jun 1 21:42:07 2011 -0700
"privates.h", line 198: warning: void function cannot return value
Providing an argument to return in a function with void return type
is not allowed by the C standard, and makes the Sun compilers unhappy.
(They actually flag it as an error, unless using a new enough version
to be able to downgrade it to a warning with "-features=extensions".)
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
Reviewed-by: Daniel Stone <daniel at fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi at debian.org>
(cherry picked from commit bc04065b5ce277f3ac3491ff221a60ef3c7605cf)
diff --git a/include/privates.h b/include/privates.h
index 7ef2cb7..2b0040c 100644
--- a/include/privates.h
+++ b/include/privates.h
@@ -195,7 +195,7 @@ dixGetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, ScreenP
static inline void
dixSetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, ScreenPtr pScreen, pointer val)
{
- return dixSetPrivate(privates, _dixGetScreenPrivateKey(key, pScreen), val);
+ dixSetPrivate(privates, _dixGetScreenPrivateKey(key, pScreen), val);
}
static inline pointer
More information about the xorg-commit
mailing list