[PATCH 1.10] "privates.h", line 198: warning: void function cannot return value

[Jeremy Huddleston]

Merged.

   5752cc4..6a16c4c  server-1.10-branch -> server-1.10-branch

On Jun 1, 2011, at 9:42 PM, Alan Coopersmith wrote:

> 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)
> ---
> include/privates.h |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 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
> -- 
> 1.7.3.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>