summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2004-02-23 20:35:41 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2004-02-23 20:35:41 +0000
commit32d7dc13777fee72c185b64bafc64f6525c474c5 (patch)
treef0ba9a177a375b43d8b3573647352285be1e7d4a
parent86cae258ef5b7de939d2b4af5669992815145f61 (diff)
Import most of XFree86 4.4RC3. This import excludes files which have thexf86-4_3_99_903_special
new license. If we want to, later we can import 4.4RC3 again and pick up the files that have the new license, but for now the vendor branch is "pure."
-rw-r--r--os/error.c4
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
}