[svn-commits] russell: branch 1.4 r253631 - in /branches/1.4: ./ apps/ channels/ main/ pbx/...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Mar 20 14:17:35 CDT 2010
Author: russell
Date: Sat Mar 20 14:17:28 2010
New Revision: 253631
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253631
Log:
Resolve a number of FreeBSD build issues.
Modified:
branches/1.4/Makefile
branches/1.4/apps/app_dial.c
branches/1.4/apps/app_followme.c
branches/1.4/channels/chan_dahdi.c
branches/1.4/main/http.c
branches/1.4/main/manager.c
branches/1.4/main/sched.c
branches/1.4/main/utils.c
branches/1.4/pbx/pbx_dundi.c
branches/1.4/res/res_features.c
Modified: branches/1.4/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/Makefile?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Sat Mar 20 14:17:28 2010
@@ -358,10 +358,10 @@
main: $(filter-out main,$(MOD_SUBDIRS))
$(MOD_SUBDIRS):
- + at _ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ + at _ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- + at _ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" $(MAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ + at _ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
Modified: branches/1.4/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_dial.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/apps/app_dial.c (original)
+++ branches/1.4/apps/app_dial.c Sat Mar 20 14:17:28 2010
@@ -870,12 +870,12 @@
ast_channel_lock(chan);
if (chan->cdr->answer.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
+ snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
}
if (chan->cdr->start.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
+ snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
}
ast_channel_unlock(chan);
Modified: branches/1.4/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_followme.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/apps/app_followme.c (original)
+++ branches/1.4/apps/app_followme.c Sat Mar 20 14:17:28 2010
@@ -928,12 +928,12 @@
ast_channel_lock(chan);
if (chan->cdr->answer.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->answer.tv_sec);
+ snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
}
if (chan->cdr->start.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", end - chan->cdr->start.tv_sec);
+ snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
}
ast_channel_unlock(chan);
Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Sat Mar 20 14:17:28 2010
@@ -51,7 +51,7 @@
#include <stdio.h>
#include <string.h>
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__FreeBSD__)
#include <pthread.h>
#include <signal.h>
#else
Modified: branches/1.4/main/http.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/http.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/main/http.c (original)
+++ branches/1.4/main/http.c Sat Mar 20 14:17:28 2010
@@ -47,6 +47,7 @@
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
+#include <signal.h>
#include "asterisk/cli.h"
#include "asterisk/http.h"
Modified: branches/1.4/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/manager.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Sat Mar 20 14:17:28 2010
@@ -2589,7 +2589,7 @@
now = ast_tvnow();
ast_dynamic_str_thread_append(&buf, 0, &manager_event_buf,
"Timestamp: %ld.%06lu\r\n",
- now.tv_sec, (unsigned long) now.tv_usec);
+ (long) now.tv_sec, (unsigned long) now.tv_usec);
}
va_start(ap, fmt);
Modified: branches/1.4/main/sched.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/sched.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/main/sched.c (original)
+++ branches/1.4/main/sched.c Sat Mar 20 14:17:28 2010
@@ -316,7 +316,7 @@
q->id,
q->callback,
q->data,
- delta.tv_sec,
+ (long) delta.tv_sec,
(long int)delta.tv_usec);
}
ast_log(LOG_DEBUG, "=============================================================\n");
Modified: branches/1.4/main/utils.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/utils.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/main/utils.c (original)
+++ branches/1.4/main/utils.c Sat Mar 20 14:17:28 2010
@@ -1099,12 +1099,12 @@
{
if (a.tv_usec >= ONE_MILLION) {
ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n",
- a.tv_sec, (long int) a.tv_usec);
+ (long) a.tv_sec, (long int) a.tv_usec);
a.tv_sec += a.tv_usec / ONE_MILLION;
a.tv_usec %= ONE_MILLION;
} else if (a.tv_usec < 0) {
ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n",
- a.tv_sec, (long int) a.tv_usec);
+ (long) a.tv_sec, (long int) a.tv_usec);
a.tv_usec = 0;
}
return a;
Modified: branches/1.4/pbx/pbx_dundi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/pbx/pbx_dundi.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/pbx/pbx_dundi.c (original)
+++ branches/1.4/pbx/pbx_dundi.c Sat Mar 20 14:17:28 2010
@@ -38,6 +38,7 @@
#include <string.h>
#include <errno.h>
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__)
+#include <signal.h>
#include <sys/types.h>
#include <netinet/in_systm.h>
#endif
Modified: branches/1.4/res/res_features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_features.c?view=diff&rev=253631&r1=253630&r2=253631
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Sat Mar 20 14:17:28 2010
@@ -33,6 +33,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include <pthread.h>
+#include <signal.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
@@ -2726,7 +2727,7 @@
for (cur = parkinglot; cur; cur = cur->next) {
ast_cli(fd, "%-10.10s %25s (%-15s %-12s %-4d) %6lds\n"
,cur->parkingexten, cur->chan->name, cur->context, cur->exten
- ,cur->priority, cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL));
+ ,cur->priority, (long) cur->start.tv_sec + (cur->parkingtime/1000) - time(NULL));
numparked++;
}
More information about the svn-commits
mailing list