From 793b1e4345762d98ecc0ffbf6ace0b901c0b52b5 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@gnu.org>
Date: Mon, 24 Apr 2006 21:13:34 +0000
Subject: [PATCH] Use gnulib exit module.

---
 ChangeLog                    |  4 ++++
 Smake                        |  1 +
 src/ChangeLog                |  5 +++++
 src/language/lexer/ChangeLog |  5 +++++
 src/language/lexer/q2c.c     | 11 +----------
 src/message.c                | 10 +---------
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 377c6c06..02ffc5dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 24 14:12:25 2006  Ben Pfaff  <blp@gnu.org>
+
+	* Smake: Add exit to GNULIB_MODULES.
+
 Sun Apr 23 20:34:50 2006  Ben Pfaff  <blp@gnu.org>
 
 	* Smake: Add linebreak to GNULIB_MODULES.
diff --git a/Smake b/Smake
index 686212e4..1eac2148 100644
--- a/Smake
+++ b/Smake
@@ -10,6 +10,7 @@ GNULIB_MODULES = \
 	assert \
 	c-ctype \
 	c-strtod \
+	exit \
 	full-read \
 	full-write \
 	gethostname \
diff --git a/src/ChangeLog b/src/ChangeLog
index 2930c220..75c21188 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 24 14:11:33 2006  Ben Pfaff  <blp@gnu.org>
+
+	* message.c: Use exit.h from gnulib instead of checking for and
+	defining EXIT_SUCCESS and EXIT_FAILURE by hand.
+
 Sun Apr 23 22:00:23 2006  Ben Pfaff  <blp@gnu.org>
 
 	Continue reforming error message support.  In this phase, get rid
diff --git a/src/language/lexer/ChangeLog b/src/language/lexer/ChangeLog
index 6fc3eae9..dec6835f 100644
--- a/src/language/lexer/ChangeLog
+++ b/src/language/lexer/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 24 14:12:08 2006  Ben Pfaff  <blp@gnu.org>
+
+	* q2c.c: Use exit.h from gnulib instead of checking for and
+	defining EXIT_SUCCESS and EXIT_FAILURE by hand.
+
 Sat Apr 15 14:30:35 2006  Ben Pfaff  <blp@gnu.org>
 
 	* q2c.c: Change DEBUGGING macro to DUMP_TOKENS for clarity and to
diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index ec369dbc..1b12c269 100644
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -29,16 +29,7 @@
 #include <unistd.h>
 #include <libpspp/compiler.h>
 #include <libpspp/str.h>
-
-
-/* Brokenness. */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
+#include "exit.h"
 
      
 /* Max length of an input line. */
diff --git a/src/message.c b/src/message.c
index 35debc7f..a7f226a8 100644
--- a/src/message.c
+++ b/src/message.c
@@ -30,6 +30,7 @@
 #include <data/settings.h>
 #include <ui/terminal/read-line.h>
 #include <libpspp/version.h>
+#include "exit.h"
 #include "linebreak.h"
 #include "progname.h"
 
@@ -102,15 +103,6 @@ err_check_count (void)
   getl_abort_noninteractive ();
 }
 
-/* Some machines are broken.  Compensate. */
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
 static void puts_stdout (int line_indent, const char *line, size_t length);
 static void dump_message (char *msg,
                           void (*func) (int line_indent,
-- 
2.30.2