X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbackupfile.h;h=dfc894d4d43388e9f8888f018ce2a13bef76d3d8;hb=bc835ff38e3fb6a3d0f5ed6eed0981dde8884124;hp=346b60c3e28aa067bcf867a09899bf22f7bb5cb1;hpb=a0b977a430af88ff58d9596a60670936eb7f1d31;p=gnulib.git

diff --git a/lib/backupfile.h b/lib/backupfile.h
index 346b60c3e..dfc894d4d 100644
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -3,10 +3,10 @@
    Copyright (C) 1990, 1991, 1992, 1997, 1998, 1999, 2003, 2004 Free
    Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef BACKUPFILE_H_
 # define BACKUPFILE_H_
@@ -30,24 +28,21 @@ extern "C" {
 enum backup_type
 {
   /* Never make backups. */
-  none,
+  no_backups,
 
   /* Make simple backups of every file. */
-  simple,
+  simple_backups,
 
   /* Make numbered backups of files that already have numbered backups,
      and simple backups of the others. */
-  numbered_existing,
+  numbered_existing_backups,
 
   /* Make numbered backups of every file. */
-  numbered
+  numbered_backups
 };
 
-# define VALID_BACKUP_TYPE(Type)	\
-  ((Type) == none			\
-   || (Type) == simple			\
-   || (Type) == numbered_existing	\
-   || (Type) == numbered)
+# define VALID_BACKUP_TYPE(Type)        \
+  ((unsigned int) (Type) <= numbered_backups)
 
 extern char const *simple_backup_suffix;