3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE

2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich).
1. First add of SUN's XIVIE extension (Stuart Kreitman).

1 files changed, 2 insertions, 2 deletions

diff --git a/os/error.c b/os/error.c
index c6adcaf..20b877c 100644
--- a/os/error.c
+++ b/os/error.c
@@ -44,7 +44,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/xfs/os/error.c,v 1.11 2002/10/15 01:45:03 dawes Exp $ */
+/* $XFree86: xc/programs/xfs/os/error.c,v 1.12 2004/01/28 22:12:49 herrb Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
@@ -95,7 +95,7 @@ abort_server(void)
 #ifdef SABER
     saber_stop();
 #else
-    abort();
+    _exit(1);
 #endif
 }