equal
deleted
inserted
replaced
1 --- hw/xfree86/common/xf86Events.c Sat Oct 20 10:14:20 2007 |
1 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Events.c hw/xfree86/common/xf86Events.c |
2 +++ hw/xfree86/common/xf86Events.c Sat Oct 20 10:15:59 2007 |
2 --- hw/xfree86/common/xf86Events.c 2008-09-23 11:24:58.000000000 -0700 |
3 @@ -1456,8 +1456,32 @@ |
3 +++ hw/xfree86/common/xf86Events.c 2008-09-24 20:24:56.137289000 -0700 |
4 #endif |
4 @@ -764,6 +764,31 @@ xf86SigHandler(int signo) |
|
5 xorg_backtrace(); |
5 |
6 |
6 xorg_backtrace(); |
|
7 - |
|
8 FatalError("Caught signal %d. Server aborting\n", signo); |
7 FatalError("Caught signal %d. Server aborting\n", signo); |
9 + |
8 + |
10 +/* CR 6545884 If server crashes keyboard left in un-encoded mode*/ |
9 +/* CR 6545884 If server crashes keyboard left in un-encoded mode*/ |
11 +#ifdef sun |
10 +#ifdef sun |
12 + { |
11 + { |
31 + } |
30 + } |
32 +#endif |
31 +#endif |
33 + |
32 + |
34 } |
33 } |
35 |
34 |
36 #ifdef MEMDEBUG |
35 static void |