# HG changeset patch # User Bruno Haible # Date 1293242307 -3600 # Node ID ac9f5990172137a7e263d4195dcac5c0b4b4c4d0 # Parent 1d257f14690f7227ef4188161764d483b80ca812 ceil, trunc, round: Fix gcc warnings. * lib/ceil.c (MIN): Undefine before redefining. * lib/trunc.c (MIN): Likewise. * lib/round.c (MIN): Likewise. Include first. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-12-24 Bruno Haible + + ceil, trunc, round: Fix gcc warnings. + * lib/ceil.c (MIN): Undefine before redefining. + * lib/trunc.c (MIN): Likewise. + * lib/round.c (MIN): Likewise. + Include first. + 2010-12-24 Bruno Haible select tests: Avoid failures on OSF/1 5.1. diff --git a/lib/ceil.c b/lib/ceil.c --- a/lib/ceil.c +++ b/lib/ceil.c @@ -23,6 +23,8 @@ #include +#undef MIN + #ifdef USE_LONG_DOUBLE # define FUNC ceill # define DOUBLE long double diff --git a/lib/round.c b/lib/round.c --- a/lib/round.c +++ b/lib/round.c @@ -20,8 +20,12 @@ #include +/* Specification. */ +#include + #include -#include + +#undef MIN #ifdef USE_LONG_DOUBLE # define ROUND roundl diff --git a/lib/trunc.c b/lib/trunc.c --- a/lib/trunc.c +++ b/lib/trunc.c @@ -23,6 +23,8 @@ #include +#undef MIN + #ifdef USE_LONG_DOUBLE # define FUNC truncl # define DOUBLE long double