Mark Michelson 35ac1ad736 Merged revisions 157496 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

........
r157496 | mmichelson | 2008-11-18 15:59:24 -0600 (Tue, 18 Nov 2008) | 6 lines

Based on Russell's advice on the asterisk-dev list, I have
changed from using a global lock in update_call_counter to
using the locks within the sip_pvt and sip_peer structures
instead.


........


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

2008-11-18 22:11:11 +00:00

..

h323

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

misdn

Merged revisions 132883,132966 via svnmerge from

2008-07-23 16:42:28 +00:00

xpmr

Allow chan_usbradio to compile again.

2007-10-17 16:09:01 +00:00

chan_agent.c

ast_event_unsubscribe in 1.6.0 returns void, not NULL.

2008-09-20 00:38:51 +00:00

chan_alsa.c

Merged revisions 118955,118957 via svnmerge from

2008-05-29 17:42:28 +00:00

chan_console.c

Merged revisions 135439 via svnmerge from

2008-08-04 15:02:44 +00:00

chan_dahdi.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

chan_features.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_gtalk.c

Merged revisions 139281 via svnmerge from

2008-08-21 10:02:32 +00:00

chan_h323.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

chan_iax2.c

Merged revisions 156243 via svnmerge from

2008-11-12 18:57:06 +00:00

chan_jingle.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

chan_local.c

Merged revisions 157306 via svnmerge from

2008-11-18 18:32:18 +00:00

chan_mgcp.c

Merged revisions 152442 via svnmerge from

2008-10-28 21:39:35 +00:00

chan_misdn.c

Merged revisions 150125 via svnmerge from

2008-10-16 16:10:28 +00:00

chan_nbs.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_oss.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +00:00

chan_phone.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_sip.c

Merged revisions 157496 via svnmerge from

2008-11-18 22:11:11 +00:00

chan_skinny.c

Merged revisions 143082 via svnmerge from

2008-09-14 22:22:48 +00:00

chan_unistim.c

Merged revisions 114271 via svnmerge from

2008-04-18 19:36:26 +00:00

chan_usbradio.c

Merge changes from team/mvanbaak/cli-command-audit

2008-02-08 21:26:32 +00:00

chan_vpb.cc

Merged revisions 107525 via svnmerge from

2008-03-11 15:39:53 +00:00

console_board.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_gui.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

console_video.h

Two changes:

2008-01-09 18:03:40 +00:00

DialTone.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

iax2-parser.c

Recorded merge of revisions 143031 via svnmerge from

2008-09-13 13:57:05 +00:00

iax2-parser.h

Merged revisions 75445 via svnmerge from

2007-07-17 20:49:09 +00:00

iax2-provision.c

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Merged revisions 114884 via svnmerge from

2008-04-30 14:55:16 +00:00

Makefile

Merged revisions 107715 via svnmerge from

2008-03-11 20:51:18 +00:00

misdn_config.c

Merged revisions 136594 via svnmerge from

2008-08-07 19:19:49 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

vgrabbers.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00