xserver: Branch 'master'

[Adam Jackson]

 xkb/ddxLoad.c |    2 +-
 xkb/xkbInit.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5035741fd4cb4918957064a8c9ded9c7c31b4e22
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jul 23 13:38:38 2008 -0400

    Unifdef __osf__

diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 25a07f0..fc49d99 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -48,7 +48,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XI.h>
 #include "xkb.h"
 
-#if defined(CSRG_BASED) || defined(linux) || defined(__osf__) || defined(__GNU__)
+#if defined(CSRG_BASED) || defined(linux) || defined(__GNU__)
 #include <paths.h>
 #endif
 
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 9033a13..0b93e87 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -55,7 +55,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #define	CREATE_ATOM(s)	MakeAtom(s,sizeof(s)-1,1)
 
-#if defined(__osf__) || defined(__alpha) || defined(__alpha__)
+#if defined(__alpha) || defined(__alpha__)
 #define	LED_COMPOSE	2
 #define LED_CAPS	3
 #define	LED_SCROLL	4