xserver: Branch 'master'

[Adam Jackson]

 Xext/syncsrv.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit beb749c87f383a62172a9ffa36373438e7a12d8e
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Dec 11 17:04:37 2008 -0500

    Fix syncsrv.h guard define

diff --git a/Xext/syncsrv.h b/Xext/syncsrv.h
index 93f6b9d..00e0bda 100644
--- a/Xext/syncsrv.h
+++ b/Xext/syncsrv.h
@@ -48,8 +48,8 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#ifndef _SYNCSTR_H_
-#define _SYNCSTR_H_
+#ifndef _SYNCSRV_H_
+#define _SYNCSRV_H_
 
 #define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
 
@@ -173,4 +173,4 @@ extern void SyncDestroySystemCounter(
 );
 extern void InitServertime(void);
 
-#endif /* _SYNCSTR_H_ */
+#endif /* _SYNCSRV_H_ */