From: Cédric Bosdonnat <cbosdonnat@suse.com>
Date: Thu, 18 Sep 2014 21:23:11 +0000 (+0200)
Subject: Renamed internal __mon_yday into mon_yday to avoid conflicts
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=90712bb5c08ec7cf684576dcad20c1ef9d28fdea;p=libvirt.git

Renamed internal __mon_yday into mon_yday to avoid conflicts

libc has another constant with the same name, which leads to
redefinition error when building against static libvirt
---

diff --git a/src/util/virtime.c b/src/util/virtime.c
index acbec41635..9d365d51c8 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] = {
+static const unsigned short int mon_yday[2][13] = {
     /* Normal years.  */
     { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
     /* Leap years.  */
@@ -160,7 +160,7 @@ void virTimeFieldsThen(unsigned long long when, struct tm *fields)
     fields->tm_year = y - 1900;
 
     fields->tm_yday = days;
-    ip = __mon_yday[is_leap_year(y)];
+    ip = mon_yday[is_leap_year(y)];
     for (y = 11; days < (long int) ip[y]; --y)
         continue;
     days -= ip[y];