X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.c;h=7bc733545c2ae8efc7ec1d7aea597cb4455b87cb;hb=e6d6498c6caf7642510024fefbf64e9d477b19cf;hp=760b2a57b4a3d3a060d7094e9501622e4b939db1;hpb=e911cfd715b17d7314df5882f00b86a2cef6c3ad;p=gnulib.git diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 760b2a57b..7bc733545 100644 --- a/lib/xstrtol.c +++ b/lib/xstrtol.c @@ -1,5 +1,5 @@ /* A more useful interface to strtol. - Copyright 1995, 1996, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1998-2000 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 @@ -86,6 +86,10 @@ long int strtol (); unsigned long int strtoul (); #endif +#ifndef strtoumax +uintmax_t strtoumax (); +#endif + static int bkm_scale (__strtol_t *x, int scale_factor) { @@ -195,6 +199,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base, break; case 'G': /* Giga */ + case 'g': /* 'g' is undocumented; for compatibility only */ overflow = bkm_scale_by_power (&tmp, base, 3); break; @@ -203,7 +208,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base, break; case 'M': /* Mega */ - case 'm': /* 'm' is undocumented; for backward compatibility only */ + case 'm': /* 'm' is undocumented; for compatibility only */ overflow = bkm_scale_by_power (&tmp, base, 2); break; @@ -212,6 +217,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base, break; case 'T': /* Tera */ + case 't': /* 't' is undocumented; for compatibility only */ overflow = bkm_scale_by_power (&tmp, base, 4); break;