X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=475728aa44c908e31713a6e3c477b316ec7f2551;hb=5d0b385594bc914e6233988bfb6bc1b92a2184b5;hp=5765c88e239b7ddb3c9f5afa348518c46edc7e46;hpb=e89390843fe30c85bba83fe7bc90fdfdfa15e253;p=gnulib.git diff --git a/lib/xstrtol.h b/lib/xstrtol.h index 5765c88e2..475728aa4 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 Free - Software Foundation, Inc. + Copyright (C) 1995, 1996, 1998, 1999, 2001, 2002, 2003, 2004, 2006 + 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 @@ -15,21 +15,16 @@ 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef XSTRTOL_H_ # define XSTRTOL_H_ 1 # include "exitfail.h" -/* Get uintmax_t. */ -# if HAVE_INTTYPES_H -# include -# else -# if HAVE_STDINT_H -# include -# endif -# endif +# include + +# include "gettext.h" # ifndef _STRTOL_ERROR enum strtol_error @@ -64,18 +59,19 @@ _DECLARE_XSTRTOL (xstrtoumax, uintmax_t) abort (); \ \ case LONGINT_INVALID: \ - error ((Exit_code), 0, "invalid %s `%s'", \ + error ((Exit_code), 0, gettext ("invalid %s `%s'"), \ (Argument_type_string), (Str)); \ break; \ \ case LONGINT_INVALID_SUFFIX_CHAR: \ case LONGINT_INVALID_SUFFIX_CHAR | LONGINT_OVERFLOW: \ - error ((Exit_code), 0, "invalid character following %s in `%s'", \ + error ((Exit_code), 0, \ + gettext ("invalid character following %s in `%s'"), \ (Argument_type_string), (Str)); \ break; \ \ case LONGINT_OVERFLOW: \ - error ((Exit_code), 0, "%s `%s' too large", \ + error ((Exit_code), 0, gettext ("%s `%s' too large"), \ (Argument_type_string), (Str)); \ break; \ } \