revert-to-4.0-b7

diff --git a/lib/backupfile.c b/lib/backupfile.c
index c20337a0a87ffd34bc018de5e8360e1e2a08c766..a1b05a12330e64b6257eec2ca6a772c91b7f5961 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -97,18 +97,6 @@ char *malloc ();
 # define REAL_DIR_ENTRY(dp) 1
 #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 BACKUPFILE_EXIT_FAILURE
-# define BACKUPFILE_EXIT_FAILURE EXIT_FAILURE
-#endif
-
 /* The extension added to file names to produce a simple (as opposed
    to numbered) backup file name. */
 const char *simple_backup_suffix = "~";
@@ -224,7 +212,7 @@ version_number (const char *base, const char *backup, size_t base_length)
 }
 #endif /* HAVE_DIR */
 
-static const char *const backup_args[] =
+static const char * const backup_args[] =
 {
   "never", "simple", "nil", "existing", "t", "numbered", 0
 };
@@ -248,7 +236,7 @@ get_version (const char *version)
   if (i < 0)
     {
       invalid_arg ("version control type", version, i);
-      exit (BACKUPFILE_EXIT_FAILURE);
+      exit (2);
     }
   return backup_types[i];
 }