X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fhuman.h;h=4ec9f0da8602f1620291b58828ca712f2527aec0;hb=ff32653598f7eb683c2a65c2d6e5cd15c7e5e73d;hp=b91958bec6365299bc89e36a9f37d94835e508a3;hpb=6c075911d8939f245a4ec73c9ba079becffc7c61;p=gnulib.git

diff --git a/lib/human.h b/lib/human.h
index b91958bec..4ec9f0da8 100644
--- a/lib/human.h
+++ b/lib/human.h
@@ -1,20 +1,39 @@
 #ifndef HUMAN_H_
 # define HUMAN_H_ 1
 
+# if HAVE_CONFIG_H
+#  include <config.h>
+# endif
+
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
+# endif
+
 /* A conservative bound on the maximum length of a human-readable string.
    The output can be the product of the largest uintmax_t and the largest int,
    so add their sizes before converting to a bound on digits.  */
 # define LONGEST_HUMAN_READABLE ((sizeof (uintmax_t) + sizeof (int)) \
 				 * CHAR_BIT / 3)
 
-# ifndef __P
-#  if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#   define __P(args) args
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
 #  else
-#   define __P(args) ()
-#  endif  /* GCC.  */
-# endif  /* Not __P.  */
+#   define PARAMS(Args) ()
+#  endif
+# endif
+
+enum human_inexact_style
+{
+  human_floor = -1,
+  human_round_to_even = 0,
+  human_ceiling = 1
+};
+
+char *human_readable PARAMS ((uintmax_t, char *, int, int));
+char *human_readable_inexact PARAMS ((uintmax_t, char *, int, int,
+				      enum human_inexact_style));
 
-char *human_readable __P ((uintmax_t, char *, int, int, int));
+void human_block_size PARAMS ((char const *, int, int *));
 
 #endif /* HUMAN_H_ */