On Thu, 2014-09-18 at 16:38 -0600, Eric Blake wrote:
On 09/18/2014 03:24 PM, Cédric Bosdonnat wrote:
> libc has another constant with the same name, which leads to
> redefinition error when building against static libvirt
> ---
> src/util/virtime.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/util/virtime.c b/src/util/virtime.c
> index acbec41..7b3ec44 100644
> --- a/src/util/virtime.c
> +++ b/src/util/virtime.c
> @@ -105,7 +105,7 @@ int virTimeFieldsNowRaw(struct tm *fields)
> #define DIV(a, b) ((a) / (b) - ((a) % (b) < 0))
> #define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400))
>
> -const unsigned short int __mon_yday[2][13] = {
> +const unsigned short int __vir_mon_yday[2][13] = {
We really should stay out of the __ namespace. Can you use a more
typical name like 'mon_yday'? Also, can you mark it as static? Glibc
has it exported for sharing between multiple files, but we aren't doing
that.
Pushed with the changes you mentioned... forgot it locally.
--
Cedric