xserver: Branch 'master'

[Adam Jackson]

 Xext/sync.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dce887ff53222652c397bc96a1dd3566f5847745
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Dec 11 13:16:02 2008 -0500

    xsync: build fix
    
    argh protocol header disaster

diff --git a/Xext/sync.c b/Xext/sync.c
index d9e66b3..ac37206 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -67,7 +67,9 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
+#define _SYNC_SERVER
 #include <X11/extensions/sync.h>
+#undef _SYNC_SERVER
 #include <X11/extensions/syncstr.h>
 #include "syncsrv.h"