xserver: Branch 'master' - 2 commits

[Peter Hutterer]

 Xext/bigreq.c    |    2 ++
 Xext/syncsrv.h   |    1 +
 Xext/xcmisc.c    |    2 ++
 hw/dmx/dmxpict.c |    1 +
 4 files changed, 6 insertions(+)

New commits:
commit b9ae1b91f316a98eb3bbefe1fc61f3e0faa861e0
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Sep 21 09:22:53 2009 +1000

    dmx: silence 'implicit declaration of function ‘XFixesSetPictureClipRegion’
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 37dfa10..072e3a6 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -51,6 +51,7 @@
 
 #include <X11/extensions/render.h>
 #include <X11/extensions/renderproto.h>
+#include <X11/extensions/Xfixes.h>
 #include "picture.h"
 #include "picturestr.h"
 #include "mipict.h"
commit aa71e268f55ac39351814ab6840196c4f58bad39
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Sep 18 11:35:47 2009 +1000

    Xext: silence 'warning: no previous prototype' for sync, bigreq and xcmisc.
    
    xcmisc and bigreq don't have their own header so just declare it here to
    shut up the compiler.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 582b670..f9f15ed 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -42,6 +42,8 @@ from The Open Group.
 
 static DISPATCH_PROC(ProcBigReqDispatch);
 
+void BigReqExtensionInit(INITARGS);
+
 void
 BigReqExtensionInit(INITARGS)
 {
diff --git a/Xext/syncsrv.h b/Xext/syncsrv.h
index 00e0bda..6d0e3d6 100644
--- a/Xext/syncsrv.h
+++ b/Xext/syncsrv.h
@@ -173,4 +173,5 @@ extern void SyncDestroySystemCounter(
 );
 extern void InitServertime(void);
 
+extern void SyncExtensionInit(void);
 #endif /* _SYNCSRV_H_ */
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index f644cb4..39079a2 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -55,6 +55,8 @@ static DISPATCH_PROC(SProcXCMiscGetVersion);
 static DISPATCH_PROC(SProcXCMiscGetXIDList);
 static DISPATCH_PROC(SProcXCMiscGetXIDRange);
 
+void XCMiscExtensionInit(INITARGS);
+
 void
 XCMiscExtensionInit(INITARGS)
 {