xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/quartzKeyboard.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c8244177b0dbcb28d2f5509e6f2a3e8057889790
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Aug 26 23:09:20 2008 -0700

    XQuartz: Always use TIS for the keyboard layout seed since KB* aren't thread safe.

diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index d5d0280..264f6f8 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -1103,7 +1103,8 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev)
 /* TODO: Not thread safe */
 unsigned int QuartzSystemKeymapSeed(void) {
     static unsigned int seed = 0;
-#if defined(__x86_64__) || defined(__ppc64__)
+//#if defined(__x86_64__) || defined(__ppc64__)
+#if 1
     static TISInputSourceRef last_key_layout = NULL;
     TISInputSourceRef key_layout;