xserver: Branch 'master'

[Adam Jackson]

 Xext/shm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 835b532d6f51d08998d7ab49fcb41db8266487ce
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Aug 28 14:49:35 2008 -0400

    Build fix.

diff --git a/Xext/shm.c b/Xext/shm.c
index 9d383bc..312b9d1 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -491,7 +491,7 @@ ProcShmDetach(ClientPtr client)
  * If the given request doesn't exactly match PutImage's constraints,
  * wrap the image in a scratch pixmap header and let CopyArea sort it out.
  */
-static oid
+static void
 doShmPutImage(DrawablePtr dst, GCPtr pGC,
 	      int depth, unsigned int format,
 	      int w, int h, int sx, int sy, int sw, int sh, int dx, int dy,