X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fbackupfile.h;h=ca9f7629facd86ac026d6f4d881d8d50206745d8;hb=620ece7758e453efebf7f52a1ab9fc1c49a5020c;hp=fe5e1deb36ad6350ea4996c35fa04745cc3b6b89;hpb=68af56be3e061b97cf97150094bc50b0aa364cbb;p=gnulib.git

diff --git a/lib/backupfile.h b/lib/backupfile.h
index fe5e1deb3..ca9f7629f 100644
--- a/lib/backupfile.h
+++ b/lib/backupfile.h
@@ -1,12 +1,12 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
 
-   Copyright (C) 1990, 1991, 1992, 1997, 1998, 1999, 2003 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2011 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,35 +14,35 @@
    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_
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+
 /* When to make backup files. */
 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;
 
@@ -51,4 +51,9 @@ enum backup_type get_version (char const *context, char const *arg);
 enum backup_type xget_version (char const *context, char const *arg);
 void addext (char *, char const *, int);
 
+
+# ifdef __cplusplus
+}
+# endif
+
 #endif /* ! BACKUPFILE_H_ */