summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2010-03-20 12:03:07 +0000
committerRussell Bryant <russell@russellbryant.com>2010-03-20 12:03:07 +0000
commit3da9f8ed19fb797a5defa8116225ede37876594a (patch)
treeb61f845d52f9f1e5f552ae53debf49b2fd32392e /main
parenta5b4b429f1c6c45acdc1cde378f189429d52e327 (diff)
Resolve more compiler warnings on FreeBSD.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@253540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/cel.c2
-rw-r--r--main/features.c1
-rw-r--r--main/manager.c2
-rw-r--r--main/stdtime/localtime.c1
-rw-r--r--main/tcptls.c1
-rw-r--r--main/test.c2
6 files changed, 6 insertions, 3 deletions
diff --git a/main/cel.c b/main/cel.c
index 9fe9993a0..0e08e95c6 100644
--- a/main/cel.c
+++ b/main/cel.c
@@ -421,7 +421,7 @@ struct ast_channel *ast_cel_fabricate_channel_from_event(const struct ast_event
}
if (ast_strlen_zero(cel_dateformat)) {
- snprintf(timebuf, sizeof(timebuf), "%ld.%06ld", record.event_time.tv_sec,
+ snprintf(timebuf, sizeof(timebuf), "%ld.%06ld", (long) record.event_time.tv_sec,
(long) record.event_time.tv_usec);
} else {
struct ast_tm tm;
diff --git a/main/features.c b/main/features.c
index 5a2bb0269..44daf3779 100644
--- a/main/features.c
+++ b/main/features.c
@@ -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>
diff --git a/main/manager.c b/main/manager.c
index fdcf2bbc8..f811987f7 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2159,7 +2159,7 @@ static int action_ping(struct mansession *s, const struct message *m)
"Ping: Pong\r\n"
"Timestamp: %ld.%06lu\r\n"
"\r\n",
- now.tv_sec, (unsigned long) now.tv_usec);
+ (long) now.tv_sec, (unsigned long) now.tv_usec);
return 0;
}
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 4440a55ef..836ed2155 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -48,6 +48,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+#include <signal.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <float.h>
diff --git a/main/tcptls.c b/main/tcptls.c
index 5c419c4af..8c95502e7 100644
--- a/main/tcptls.c
+++ b/main/tcptls.c
@@ -33,6 +33,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <fcntl.h>
#endif
+#include <signal.h>
#include <sys/signal.h>
#include "asterisk/compat.h"
diff --git a/main/test.c b/main/test.c
index c5223e6a8..766775c7a 100644
--- a/main/test.c
+++ b/main/test.c
@@ -848,7 +848,7 @@ static char *test_cli_generate_results(struct ast_cli_entry *e, int cmd, struct
if (!(buf = ast_str_create(256))) {
return NULL;
}
- ast_str_set(&buf, 0, "%s/asterisk_test_results-%ld.%s", ast_config_AST_LOG_DIR, time.tv_sec, type);
+ ast_str_set(&buf, 0, "%s/asterisk_test_results-%ld.%s", ast_config_AST_LOG_DIR, (long) time.tv_sec, type);
file = ast_str_buffer(buf);
}