3 files changed, 16 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 5768488..d30cfa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-06-23  Paul D. Smith  <psmith@gnu.org>
 
+	* main.c (main): Replace EXIT_SUCCESS, EXIT_FAILURE, and
+	EXIT_TROUBLE with MAKE_SUCCESS, MAKE_FAILURE, and MAKE_TROUBLE.
+	* make.h: Define these macros.
+
 	* Version 3.79.1 released.
 
 	* configure.in: Add a new option, --disable-nsec-timestamps, to
diff --git a/main.c b/main.c
index af40349..c82591b 100644
--- a/main.c
+++ b/main.c
@@ -1904,16 +1904,16 @@ int main (int argc, char ** argv)
         /* Nothing happened.  */
       case 0:
         /* Updated successfully.  */
-        status = EXIT_SUCCESS;
+        status = MAKE_SUCCESS;
+        break;
+      case 1:
+        /* We are under -q and would run some commands.  */
+        status = MAKE_TROUBLE;
         break;
       case 2:
         /* Updating failed.  POSIX.2 specifies exit status >1 for this;
            but in VMS, there is only success and failure.  */
-        status = EXIT_FAILURE ? 2 : EXIT_FAILURE;
-        break;
-      case 1:
-        /* We are under -q and would run some commands.  */
-        status = EXIT_FAILURE;
+        status = MAKE_FAILURE;
         break;
       default:
         abort ();
diff --git a/make.h b/make.h
index 8ddbb94..bc4c1d4 100644
--- a/make.h
+++ b/make.h
@@ -532,25 +532,13 @@ extern int handling_fatal_signal;
 #endif
 
 #ifdef VMS
-# ifndef EXIT_FAILURE
-#  define EXIT_FAILURE 3
-# endif
-# ifndef EXIT_SUCCESS
-#  define EXIT_SUCCESS 1
-# endif
-# ifndef EXIT_TROUBLE
-#  define EXIT_TROUBLE 2
-# endif
+#  define MAKE_SUCCESS 1
+#  define MAKE_TROUBLE 2
+#  define MAKE_FAILURE 3
 #else
-# ifndef EXIT_FAILURE
-#  define EXIT_FAILURE 2
-# endif
-# ifndef EXIT_SUCCESS
-#  define EXIT_SUCCESS 0
-# endif
-# ifndef EXIT_TROUBLE
-#  define EXIT_TROUBLE 1
-# endif
+#  define MAKE_SUCCESS 0
+#  define MAKE_TROUBLE 1
+#  define MAKE_FAILURE 2
 #endif
 
 /* Set up heap debugging library dmalloc.  */