X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=3a94a9c6da811272707c6657c1930814bc8efcde;hb=c358102053be9ce7f33788c579f6e1e034f143c9;hp=336af8d6bcf24653e0f9933d4c8cf00a4fece1cb;hpb=e9c57721db5e7cf2a19d93761d8c13e0c9701953;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 336af8d6b..3a94a9c6d 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,12 +1,12 @@
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2010 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,8 +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; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef XSTRTOL_H_
 # define XSTRTOL_H_ 1
@@ -34,7 +33,7 @@ enum strtol_error
     LONGINT_INVALID_SUFFIX_CHAR = 2,
 
     LONGINT_INVALID_SUFFIX_CHAR_WITH_OVERFLOW = (LONGINT_INVALID_SUFFIX_CHAR
-						 | LONGINT_OVERFLOW),
+                                                 | LONGINT_OVERFLOW),
     LONGINT_INVALID = 4
   };
 typedef enum strtol_error strtol_error;
@@ -47,8 +46,13 @@ _DECLARE_XSTRTOL (xstrtoul, unsigned long int)
 _DECLARE_XSTRTOL (xstrtoimax, intmax_t)
 _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
 
+#if HAVE_LONG_LONG_INT
+_DECLARE_XSTRTOL (xstrtoll, long long int)
+_DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
+#endif
+
 #ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
 #  define __attribute__(x)
 # endif
 #endif
@@ -73,7 +77,7 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
    After reporting an error, exit with a failure status.  */
 
 void xstrtol_fatal (enum strtol_error,
-		    int, char, struct option const *,
-		    char const *) ATTRIBUTE_NORETURN;
+                    int, char, struct option const *,
+                    char const *) ATTRIBUTE_NORETURN;
 
 #endif /* not XSTRTOL_H_ */