diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-22 17:42:14 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-06-22 17:42:14 +0000 |
commit | ae5c80e1deeae11fa0f3478a6efa03e38971897f (patch) | |
tree | a3a0875ae4e73c9d9a1fc67f56ffa1ce73fe5457 /cli.c | |
parent | 8f813d432c685f0b0c25e98261379b083263cf32 (diff) |
Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3273 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cli.c')
-rwxr-xr-x | cli.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -181,8 +181,8 @@ static char *format_uptimestr(time_t timeval) char timestr[256]; int pos = 0; #define SECOND (1) -#define MIN (SECOND*60) -#define HOUR (MIN*60) +#define MINUTE (SECOND*60) +#define HOUR (MINUTE*60) #define DAY (HOUR*24) #define WEEK (DAY*7) #define YEAR (DAY*365) @@ -222,9 +222,9 @@ static char *format_uptimestr(time_t timeval) else pos += sprintf(timestr + pos, "1 hour, "); } - if (timeval > MIN) { - mins = (timeval / MIN); - timeval -= (mins * MIN); + if (timeval > MINUTE) { + mins = (timeval / MINUTE); + timeval -= (mins * MINUTE); if (mins > 1) pos += sprintf(timestr + pos, "%d minutes, ", mins); else if (mins > 0) |