* src/system.h (EXIT_SUCCESS, EXIT_FAILURE): Ensure a proper

definition.
* src/main.c (main): Use them.
Suggested by Hans Aberg.

diff --git a/ChangeLog b/ChangeLog
index c3c5ef32dc20bfdc7f8ec6948bd35ccea4ca8d4d..b3ec41f2026f6e8cf85ff879e77b1be92c84581b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-14  Akim Demaille  <akim@epita.fr>
+
+       * src/system.h (EXIT_SUCCESS, EXIT_FAILURE): Ensure a proper
+       definition.
+       * src/main.c (main): Use them.
+       Suggested by Hans Aberg.
+

 2001-11-12  Akim Demaille  <akim@epita.fr>
 
        * src/system.h (ngettext): Now that we use ngettext, be sure to
 2001-11-12  Akim Demaille  <akim@epita.fr>
 
        * src/system.h (ngettext): Now that we use ngettext, be sure to


@@ -60,7 +67,7 @@
        (conflicts_print, conflicts_output): New.
        * src/conflicts.h: Adjust.
        * src/main.c (main): Invoke both conflicts_output and conflicts_print.
        (conflicts_print, conflicts_output): New.
        * src/conflicts.h: Adjust.
        * src/main.c (main): Invoke both conflicts_output and conflicts_print.

-       * src/print.c (print_grammar): Issue `\n' between to rule outputs.
+       * src/print.c (print_grammar): Issue `\n' between two rules.

        * tests/regression.at (Conflicts): New.
        Reported by Tom Lane.
 
        * tests/regression.at (Conflicts): New.
        Reported by Tom Lane.
 


@@ -79,7 +86,7 @@
 
        * src/bison.simple (YYSTACK_REALLOC): New.
        (yyparse) [!yyoverflow]: Use it and free the old stack.
 
        * src/bison.simple (YYSTACK_REALLOC): New.
        (yyparse) [!yyoverflow]: Use it and free the old stack.

-       Reported by FIXME: Who.
+       Reported by Per Allansson.

 
 2001-11-12  Pascal Bart  <pascal.bart@epita.fr>
 
 
 2001-11-12  Pascal Bart  <pascal.bart@epita.fr>
 

diff --git a/src/main.c b/src/main.c
index 674c56d5fd7634763dc33643a820a9fdfcb1115e..10d5e0a8457b00e0205ddd06afe1b743ef3a7b78 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
 
   output_files ();
 
 
   output_files ();
 

-  exit (complain_message_count ? 1 : 0);
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 \f
 /* Abort for an internal error denoted by string S.  */
 }
 \f
 /* Abort for an internal error denoted by string S.  */

diff --git a/src/system.h b/src/system.h
index a0b46eee3460882003d18a77b13c5c8f23b6d46d..bfd244637a0b8fe1efb9508df6f9ea07eaf4a16e 100644 (file)
--- a/src/system.h
+++ b/src/system.h
@@ -40,6 +40,18 @@
 # include <stdlib.h>
 #endif
 
 # include <stdlib.h>
 #endif
 

+/* The following test is to work around the gross typo in
+   systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE
+   is defined to 0, not 1.  */
+#if !EXIT_FAILURE
+# undef EXIT_FAILURE
+# define EXIT_FAILURE 1
+#endif
+
+#ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
+#endif
+

 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif