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

1 files changed, 5 insertions, 5 deletions

diff --git a/cli.c b/cli.c
index 421617d01..6543a0bf0 100755
--- a/cli.c
+++ b/cli.c
@@ -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)