X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxstrtol.h;h=3a94a9c6da811272707c6657c1930814bc8efcde;hb=a6e3f90ba60482e679b8c60a2e2658058715da12;hp=9ac168bf38980689a72280af6720a7930a2b06a0;hpb=15834b98efed40c82ee182c367b636e1769cb62a;p=gnulib.git diff --git a/lib/xstrtol.h b/lib/xstrtol.h index 9ac168bf3..3a94a9c6d 100644 --- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -1,7 +1,7 @@ /* A more useful interface to strtol. - Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006, 2007, - 2008 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 it under the terms of the GNU General Public License as published by @@ -33,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; @@ -46,6 +46,11 @@ _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) # define __attribute__(x) @@ -72,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_ */