X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhuman.h;h=11b1e0cee46af96c8182b86cdef438d6b8e9ebfa;hb=ade4fb6ef4588f370c1bdbdb90665501140a608d;hp=44b8b36d571eebc2131cfb97e806d87bc4cf6c77;hpb=ae758e2cf41d0162760624407a2ee98e50dcb181;p=gnulib.git diff --git a/lib/human.h b/lib/human.h index 44b8b36d5..11b1e0cee 100644 --- a/lib/human.h +++ b/lib/human.h @@ -1,12 +1,12 @@ /* human.h -- print human readable file size Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. + 2005, 2006, 2007 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 . */ /* Written by Paul Eggert and Larry McVoy. */ @@ -27,6 +26,8 @@ # include # include +# include + /* A conservative bound on the maximum length of a human-readable string. The output can be the square of the largest uintmax_t, so double its size before converting to a bound. @@ -78,6 +79,6 @@ enum char *human_readable (uintmax_t, char *, int, uintmax_t, uintmax_t); -int human_options (char const *, bool, uintmax_t *); +enum strtol_error human_options (char const *, int *, uintmax_t *); #endif /* HUMAN_H_ */