[svn-commits] russell: branch 1.6.1 r253624 - in /branches/1.6.1: ./ cdr/ main/ main/stdtime/

[SVN commits to the Digium repositories]

Author: russell
Date: Sat Mar 20 12:55:02 2010
New Revision: 253624

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253624
Log:
Merged revisions 253540 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253540 | russell | 2010-03-20 07:03:07 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve more compiler warnings on FreeBSD.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/cdr/cdr_pgsql.c
    branches/1.6.1/main/features.c
    branches/1.6.1/main/stdtime/localtime.c
    branches/1.6.1/main/tcptls.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/cdr/cdr_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/cdr/cdr_pgsql.c?view=diff&rev=253624&r1=253623&r2=253624
==============================================================================
--- branches/1.6.1/cdr/cdr_pgsql.c (original)
+++ branches/1.6.1/cdr/cdr_pgsql.c Sat Mar 20 12:55:02 2010
@@ -171,7 +171,7 @@
 			if (strcmp(cur->name, "start") == 0 || strcmp(cur->name, "calldate") == 0) {
 				if (strncmp(cur->type, "int", 3) == 0) {
 					LENGTHEN_BUF2(12);
-					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%ld", cdr->start.tv_sec);
+					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%ld", (long) cdr->start.tv_sec);
 				} else if (strncmp(cur->type, "float", 5) == 0) {
 					LENGTHEN_BUF2(30);
 					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%f", (double)cdr->start.tv_sec + (double)cdr->start.tv_usec / 1000000.0);
@@ -184,7 +184,7 @@
 			} else if (strcmp(cur->name, "answer") == 0) {
 				if (strncmp(cur->type, "int", 3) == 0) {
 					LENGTHEN_BUF2(12);
-					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%ld", cdr->answer.tv_sec);
+					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%ld", (long) cdr->answer.tv_sec);
 				} else if (strncmp(cur->type, "float", 5) == 0) {
 					LENGTHEN_BUF2(30);
 					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%f", (double)cdr->answer.tv_sec + (double)cdr->answer.tv_usec / 1000000.0);
@@ -197,7 +197,7 @@
 			} else if (strcmp(cur->name, "end") == 0) {
 				if (strncmp(cur->type, "int", 3) == 0) {
 					LENGTHEN_BUF2(12);
-					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%ld", cdr->end.tv_sec);
+					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%ld", (long) cdr->end.tv_sec);
 				} else if (strncmp(cur->type, "float", 5) == 0) {
 					LENGTHEN_BUF2(30);
 					lensql2 += snprintf(sql2 + lensql2, sizesql2 - lensql2, "%f", (double)cdr->end.tv_sec + (double)cdr->end.tv_usec / 1000000.0);

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=253624&r1=253623&r2=253624
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Sat Mar 20 12:55:02 2010
@@ -30,6 +30,7 @@
 #include "asterisk/_private.h"
 
 #include <pthread.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.h>

Modified: branches/1.6.1/main/stdtime/localtime.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/stdtime/localtime.c?view=diff&rev=253624&r1=253623&r2=253624
==============================================================================
--- branches/1.6.1/main/stdtime/localtime.c (original)
+++ branches/1.6.1/main/stdtime/localtime.c Sat Mar 20 12:55:02 2010
@@ -48,6 +48,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <signal.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <float.h>

Modified: branches/1.6.1/main/tcptls.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/tcptls.c?view=diff&rev=253624&r1=253623&r2=253624
==============================================================================
--- branches/1.6.1/main/tcptls.c (original)
+++ branches/1.6.1/main/tcptls.c Sat Mar 20 12:55:02 2010
@@ -33,6 +33,7 @@
 #include <fcntl.h>
 #endif
 
+#include <signal.h>
 #include <sys/signal.h>
 
 #include "asterisk/compat.h"