Use gnulib exit module.

diff --git a/ChangeLog b/ChangeLog
index 377c6c06ce7f0596e7ca776b2163486c58c5c496..02ffc5ddf397589926812795039805c41c8f92dc 100644 (file)
--- 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 686212e401b29abdcc42c5f17a97ae2e0b29e8f9..1eac214892e7425b58a7684b6d623c217d5d2049 100644 (file)
--- 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 2930c220824490d9feee9d11c27cea89e1d16843..75c211886c89405c2beb1c11dd93f69a6d767cf2 100644 (file)
--- 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 6fc3eae93b6f93e85dc3c2b32280984e26eb19d0..dec6835f488fdfffc479572fda2d68dd3e75f256 100644 (file)
--- 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 ec369dbcb5b3b0d04bc40d428c1ddb6f2bbcf259..1b12c269a140c80e91738c1de2f0e348a2a2dd11 100644 (file)
--- 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 35debc7f6eec0e13cb35195a34c4469717ea6f36..a7f226a8b4b31248949f03ed0c2c2961bbde132b 100644 (file)
--- 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,