]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 253540 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Sat, 20 Mar 2010 17:33:03 +0000 (17:33 +0000)
committerRussell Bryant <russell@russellbryant.com>
Sat, 20 Mar 2010 17:33:03 +0000 (17:33 +0000)
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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@253620 65c4cc65-6c06-0410-ace0-fbb531ad65f3

cdr/cdr_pgsql.c
main/features.c
main/stdtime/localtime.c
main/tcptls.c

index e32f6f4f83e46e85e21976cd53b2f88f58b2ebff..bca0f863db0798b5b868a0dd410df4245be15e46 100644 (file)
@@ -165,7 +165,7 @@ static int pgsql_log(struct ast_cdr *cdr)
                        if (strcmp(cur->name, "start") == 0 || strcmp(cur->name, "calldate") == 0) {
                                if (strncmp(cur->type, "int", 3) == 0) {
                                        LENGTHEN_BUF2(13);
-                                       ast_str_append(&sql2, 0, "%s%ld", first ? "" : ",", cdr->start.tv_sec);
+                                       ast_str_append(&sql2, 0, "%s%ld", first ? "" : ",", (long) cdr->start.tv_sec);
                                } else if (strncmp(cur->type, "float", 5) == 0) {
                                        LENGTHEN_BUF2(31);
                                        ast_str_append(&sql2, 0, "%s%f", first ? "" : ",", (double)cdr->start.tv_sec + (double)cdr->start.tv_usec / 1000000.0);
@@ -179,7 +179,7 @@ static int pgsql_log(struct ast_cdr *cdr)
                        } else if (strcmp(cur->name, "answer") == 0) {
                                if (strncmp(cur->type, "int", 3) == 0) {
                                        LENGTHEN_BUF2(13);
-                                       ast_str_append(&sql2, 0, "%s%ld", first ? "" : ",", cdr->answer.tv_sec);
+                                       ast_str_append(&sql2, 0, "%s%ld", first ? "" : ",", (long) cdr->answer.tv_sec);
                                } else if (strncmp(cur->type, "float", 5) == 0) {
                                        LENGTHEN_BUF2(31);
                                        ast_str_append(&sql2, 0, "%s%f", first ? "" : ",", (double)cdr->answer.tv_sec + (double)cdr->answer.tv_usec / 1000000.0);
@@ -193,7 +193,7 @@ static int pgsql_log(struct ast_cdr *cdr)
                        } else if (strcmp(cur->name, "end") == 0) {
                                if (strncmp(cur->type, "int", 3) == 0) {
                                        LENGTHEN_BUF2(13);
-                                       ast_str_append(&sql2, 0, "%s%ld", first ? "" : ",", cdr->end.tv_sec);
+                                       ast_str_append(&sql2, 0, "%s%ld", first ? "" : ",", (long) cdr->end.tv_sec);
                                } else if (strncmp(cur->type, "float", 5) == 0) {
                                        LENGTHEN_BUF2(31);
                                        ast_str_append(&sql2, 0, "%s%f", first ? "" : ",", (double)cdr->end.tv_sec + (double)cdr->end.tv_usec / 1000000.0);
index 29567241b225fc0345ced1490c05bc3514b12a14..ecfd8eaf7184df69757bc4f38acd63d04457fa75 100644 (file)
@@ -30,6 +30,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/_private.h"
 
 #include <pthread.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <netinet/in.h>
index 925ef029b395bd3bced1e5e41206c98f7f6dc48f..104ab09a342d90a6ab424faa80c2b20d348e68a0 100644 (file)
@@ -48,6 +48,7 @@
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
+#include <signal.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <float.h>
index d433facf5df926fea77bf058971c6af5815926bb..6c84762d5d6e4db43dfd5e171d98d9e947066c0f 100644 (file)
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <fcntl.h>
 #endif
 
+#include <signal.h>
 #include <sys/signal.h>
 
 #include "asterisk/compat.h"