[asterisk-scf-commits] asterisk-scf/integration/pjproject.git branch "fix-oneiric" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Oct 24 13:07:44 CDT 2011
branch "fix-oneiric" has been updated
discards 4eb0721525b2a3a406950f8313162d2e679bd76b (commit)
discards e92cebdb7ea8e63b161ac025ea273d8bd03394ba (commit)
via d8c7dd200994c93820a471388a537b8194d4fa87 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (4eb0721525b2a3a406950f8313162d2e679bd76b)
\
N -- N -- N (d8c7dd200994c93820a471388a537b8194d4fa87)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Summary of changes:
README.txt | 2 +-
aconfigure |12199 +++++++++++++++-----
aconfigure.ac | 37 +-
build.symbian/pjlib.mmp | 2 -
build.symbian/pjlib_test.mmp | 1 -
build.symbian/symbian_ua.mmp | 1 -
build/rules.mak | 5 -
configure-iphone | 4 +-
pjlib-util/include/pjlib-util.h | 4 +-
pjlib-util/include/pjlib-util/base64.h | 4 +-
pjlib-util/include/pjlib-util/config.h | 4 +-
pjlib-util/include/pjlib-util/crc32.h | 4 +-
pjlib-util/include/pjlib-util/dns.h | 4 +-
pjlib-util/include/pjlib-util/dns_server.h | 4 +-
pjlib-util/include/pjlib-util/errno.h | 4 +-
pjlib-util/include/pjlib-util/hmac_md5.h | 4 +-
pjlib-util/include/pjlib-util/hmac_sha1.h | 4 +-
pjlib-util/include/pjlib-util/http_client.h | 4 +-
pjlib-util/include/pjlib-util/md5.h | 4 +-
pjlib-util/include/pjlib-util/pcap.h | 4 +-
pjlib-util/include/pjlib-util/resolver.h | 4 +-
pjlib-util/include/pjlib-util/scanner.h | 4 +-
.../include/pjlib-util/scanner_cis_bitwise.h | 4 +-
pjlib-util/include/pjlib-util/scanner_cis_uint.h | 4 +-
pjlib-util/include/pjlib-util/sha1.h | 4 +-
pjlib-util/include/pjlib-util/srv_resolver.h | 4 +-
pjlib-util/include/pjlib-util/string.h | 4 +-
pjlib-util/include/pjlib-util/stun_simple.h | 4 +-
pjlib-util/include/pjlib-util/types.h | 4 +-
pjlib-util/include/pjlib-util/xml.h | 4 +-
pjlib-util/src/pjlib-util-test/encryption.c | 107 +-
pjlib-util/src/pjlib-util-test/http_client.c | 4 +-
pjlib-util/src/pjlib-util-test/main.c | 2 +-
pjlib-util/src/pjlib-util-test/resolver_test.c | 4 +-
pjlib-util/src/pjlib-util-test/stun.c | 4 +-
pjlib-util/src/pjlib-util-test/test.c | 2 +-
pjlib-util/src/pjlib-util-test/test.h | 2 +-
pjlib-util/src/pjlib-util-test/xml.c | 4 +-
pjlib-util/src/pjlib-util/base64.c | 62 +-
pjlib-util/src/pjlib-util/dns.c | 4 +-
pjlib-util/src/pjlib-util/dns_dump.c | 4 +-
pjlib-util/src/pjlib-util/dns_server.c | 4 +-
pjlib-util/src/pjlib-util/errno.c | 16 +-
pjlib-util/src/pjlib-util/getopt.c | 23 +-
pjlib-util/src/pjlib-util/hmac_md5.c | 4 +-
pjlib-util/src/pjlib-util/hmac_sha1.c | 4 +-
pjlib-util/src/pjlib-util/http_client.c | 4 +-
pjlib-util/src/pjlib-util/pcap.c | 4 +-
pjlib-util/src/pjlib-util/resolver.c | 4 +-
pjlib-util/src/pjlib-util/resolver_wrap.cpp | 4 +-
pjlib-util/src/pjlib-util/scanner.c | 4 +-
pjlib-util/src/pjlib-util/scanner_cis_bitwise.c | 4 +-
pjlib-util/src/pjlib-util/scanner_cis_uint.c | 4 +-
pjlib-util/src/pjlib-util/sha1.c | 6 +-
pjlib-util/src/pjlib-util/srv_resolver.c | 4 +-
pjlib-util/src/pjlib-util/string.c | 4 +-
pjlib-util/src/pjlib-util/stun_simple.c | 4 +-
pjlib-util/src/pjlib-util/stun_simple_client.c | 74 +-
pjlib-util/src/pjlib-util/symbols.c | 4 +-
pjlib-util/src/pjlib-util/xml.c | 4 +-
pjlib-util/src/pjlib-util/xml_wrap.cpp | 4 +-
pjlib/build/Makefile | 2 +-
pjlib/build/pjlib.vcproj | 2090 ++--
pjlib/include/pj/activesock.h | 4 +-
pjlib/include/pj/addr_resolv.h | 4 +-
pjlib/include/pj/array.h | 4 +-
pjlib/include/pj/assert.h | 4 +-
pjlib/include/pj/compat/assert.h | 4 +-
pjlib/include/pj/compat/cc_armcc.h | 4 +-
pjlib/include/pj/compat/cc_codew.h | 4 +-
pjlib/include/pj/compat/cc_gcc.h | 4 +-
pjlib/include/pj/compat/cc_gcce.h | 4 +-
pjlib/include/pj/compat/cc_msvc.h | 4 +-
pjlib/include/pj/compat/cc_mwcc.h | 4 +-
pjlib/include/pj/compat/ctype.h | 4 +-
pjlib/include/pj/compat/errno.h | 4 +-
pjlib/include/pj/compat/high_precision.h | 4 +-
pjlib/include/pj/compat/m_alpha.h | 4 +-
pjlib/include/pj/compat/m_armv4.h | 4 +-
pjlib/include/pj/compat/m_i386.h | 4 +-
pjlib/include/pj/compat/m_m68k.h | 4 +-
pjlib/include/pj/compat/m_powerpc.h | 4 +-
pjlib/include/pj/compat/m_sparc.h | 4 +-
pjlib/include/pj/compat/m_x86_64.h | 4 +-
pjlib/include/pj/compat/malloc.h | 4 +-
pjlib/include/pj/compat/os_auto.h.in | 8 +-
pjlib/include/pj/compat/os_darwinos.h | 4 +-
pjlib/include/pj/compat/os_linux.h | 4 +-
pjlib/include/pj/compat/os_linux_kernel.h | 4 +-
pjlib/include/pj/compat/os_palmos.h | 4 +-
pjlib/include/pj/compat/os_rtems.h | 4 +-
pjlib/include/pj/compat/os_sunos.h | 4 +-
pjlib/include/pj/compat/os_symbian.h | 4 +-
pjlib/include/pj/compat/os_win32.h | 4 +-
pjlib/include/pj/compat/os_win32_wince.h | 4 +-
pjlib/include/pj/compat/rand.h | 4 +-
pjlib/include/pj/compat/setjmp.h | 4 +-
pjlib/include/pj/compat/size_t.h | 4 +-
pjlib/include/pj/compat/socket.h | 4 +-
pjlib/include/pj/compat/stdarg.h | 4 +-
pjlib/include/pj/compat/stdfileio.h | 4 +-
pjlib/include/pj/compat/string.h | 4 +-
pjlib/include/pj/compat/time.h | 4 +-
pjlib/include/pj/config.h | 39 +-
pjlib/include/pj/ctype.h | 4 +-
pjlib/include/pj/doxygen.h | 4 +-
pjlib/include/pj/errno.h | 4 +-
pjlib/include/pj/except.h | 4 +-
pjlib/include/pj/fifobuf.h | 4 +-
pjlib/include/pj/file_access.h | 4 +-
pjlib/include/pj/file_io.h | 4 +-
pjlib/include/pj/guid.h | 4 +-
pjlib/include/pj/hash.h | 4 +-
pjlib/include/pj/ioqueue.h | 4 +-
pjlib/include/pj/ip_helper.h | 4 +-
pjlib/include/pj/list.h | 4 +-
pjlib/include/pj/list_i.h | 4 +-
pjlib/include/pj/lock.h | 4 +-
pjlib/include/pj/log.h | 4 +-
pjlib/include/pj/math.h | 4 +-
pjlib/include/pj/os.h | 107 +-
pjlib/include/pj/pool.h | 4 +-
pjlib/include/pj/pool_alt.h | 4 +-
pjlib/include/pj/pool_buf.h | 4 +-
pjlib/include/pj/pool_i.h | 4 +-
pjlib/include/pj/rand.h | 4 +-
pjlib/include/pj/rbtree.h | 4 +-
pjlib/include/pj/sock.h | 13 +-
pjlib/include/pj/sock_qos.h | 4 +-
pjlib/include/pj/sock_select.h | 4 +-
pjlib/include/pj/ssl_sock.h | 4 +-
pjlib/include/pj/string.h | 4 +-
pjlib/include/pj/string_i.h | 4 +-
pjlib/include/pj/types.h | 4 +-
pjlib/include/pj/unicode.h | 4 +-
pjlib/include/pjlib.h | 4 +-
pjlib/src/pj/activesock.c | 4 +-
pjlib/src/pj/addr_resolv_linux_kernel.c | 4 +-
pjlib/src/pj/addr_resolv_sock.c | 64 +-
pjlib/src/pj/addr_resolv_symbian.cpp | 4 +-
pjlib/src/pj/array.c | 4 +-
pjlib/src/pj/compat/sigjmp.c | 4 +-
pjlib/src/pj/compat/string.c | 4 +-
pjlib/src/pj/compat/string_compat.c | 4 +-
pjlib/src/pj/config.c | 13 +-
pjlib/src/pj/ctype.c | 4 +-
pjlib/src/pj/errno.c | 12 +-
pjlib/src/pj/except.c | 4 +-
pjlib/src/pj/exception_symbian.cpp | 4 +-
pjlib/src/pj/extra-exports.c | 4 +-
pjlib/src/pj/fifobuf.c | 4 +-
pjlib/src/pj/file_access_unistd.c | 4 +-
pjlib/src/pj/file_access_win32.c | 4 +-
pjlib/src/pj/file_io_ansi.c | 4 +-
pjlib/src/pj/file_io_win32.c | 4 +-
pjlib/src/pj/guid.c | 4 +-
pjlib/src/pj/guid_simple.c | 4 +-
pjlib/src/pj/guid_uuid.c | 4 +-
pjlib/src/pj/guid_win32.c | 4 +-
pjlib/src/pj/hash.c | 4 +-
pjlib/src/pj/ioqueue_common_abs.c | 52 +-
pjlib/src/pj/ioqueue_common_abs.h | 2 +-
pjlib/src/pj/ioqueue_dummy.c | 4 +-
pjlib/src/pj/ioqueue_epoll.c | 8 +-
pjlib/src/pj/ioqueue_linux_kernel.c | 4 +-
pjlib/src/pj/ioqueue_select.c | 11 +-
pjlib/src/pj/ioqueue_symbian.cpp | 4 +-
pjlib/src/pj/ioqueue_winnt.c | 8 +-
pjlib/src/pj/ip_helper_generic.c | 4 +-
pjlib/src/pj/ip_helper_symbian.cpp | 4 +-
pjlib/src/pj/ip_helper_win32.c | 4 +-
pjlib/src/pj/list.c | 4 +-
pjlib/src/pj/lock.c | 4 +-
pjlib/src/pj/log.c | 4 +-
pjlib/src/pj/log_writer_printk.c | 4 +-
pjlib/src/pj/log_writer_stdout.c | 4 +-
pjlib/src/pj/log_writer_symbian_console.cpp | 4 +-
pjlib/src/pj/os_core_linux_kernel.c | 4 +-
pjlib/src/pj/os_core_symbian.cpp | 4 +-
pjlib/src/pj/os_core_unix.c | 9 +-
pjlib/src/pj/os_core_win32.c | 4 +-
pjlib/src/pj/os_error_linux_kernel.c | 4 +-
pjlib/src/pj/os_error_symbian.cpp | 4 +-
pjlib/src/pj/os_error_unix.c | 4 +-
pjlib/src/pj/os_error_win32.c | 4 +-
pjlib/src/pj/os_info.c | 319 -
pjlib/src/pj/os_info_iphone.m | 53 -
pjlib/src/pj/os_info_symbian.cpp | 190 -
pjlib/src/pj/os_rwmutex.c | 4 +-
pjlib/src/pj/os_symbian.h | 4 +-
pjlib/src/pj/os_time_bsd.c | 4 +-
pjlib/src/pj/os_time_common.c | 4 +-
pjlib/src/pj/os_time_linux_kernel.c | 4 +-
pjlib/src/pj/os_time_unix.c | 4 +-
pjlib/src/pj/os_time_win32.c | 4 +-
pjlib/src/pj/os_timestamp_common.c | 18 +-
pjlib/src/pj/os_timestamp_linux_kernel.c | 4 +-
pjlib/src/pj/os_timestamp_posix.c | 83 +-
pjlib/src/pj/os_timestamp_win32.c | 4 +-
pjlib/src/pj/pool.c | 4 +-
pjlib/src/pj/pool_buf.c | 4 +-
pjlib/src/pj/pool_caching.c | 4 +-
pjlib/src/pj/pool_dbg.c | 4 +-
pjlib/src/pj/pool_policy_kmalloc.c | 4 +-
pjlib/src/pj/pool_policy_malloc.c | 4 +-
pjlib/src/pj/pool_policy_new.cpp | 4 +-
pjlib/src/pj/pool_signature.h | 4 +-
pjlib/src/pj/rand.c | 4 +-
pjlib/src/pj/rbtree.c | 4 +-
pjlib/src/pj/sock_bsd.c | 62 +-
pjlib/src/pj/sock_common.c | 9 +-
pjlib/src/pj/sock_linux_kernel.c | 4 +-
pjlib/src/pj/sock_qos_bsd.c | 4 +-
pjlib/src/pj/sock_qos_common.c | 4 +-
pjlib/src/pj/sock_qos_dummy.c | 4 +-
pjlib/src/pj/sock_qos_symbian.cpp | 4 +-
pjlib/src/pj/sock_qos_wm.c | 4 +-
pjlib/src/pj/sock_select.c | 4 +-
pjlib/src/pj/sock_select_symbian.cpp | 4 +-
pjlib/src/pj/sock_symbian.cpp | 5 +-
pjlib/src/pj/ssl_sock_common.c | 4 +-
pjlib/src/pj/ssl_sock_dump.c | 4 +-
pjlib/src/pj/ssl_sock_ossl.c | 20 +-
pjlib/src/pj/ssl_sock_symbian.cpp | 20 +-
pjlib/src/pj/string.c | 4 +-
pjlib/src/pj/symbols.c | 5 +-
pjlib/src/pj/timer.c | 6 +-
pjlib/src/pj/timer_symbian.cpp | 4 +-
pjlib/src/pj/types.c | 4 +-
pjlib/src/pj/unicode_symbian.cpp | 4 +-
pjlib/src/pj/unicode_win32.c | 4 +-
pjlib/src/pjlib++-test/main.cpp | 2 +-
pjlib/src/pjlib-samples/except.c | 4 +-
pjlib/src/pjlib-samples/list.c | 4 +-
pjlib/src/pjlib-samples/log.c | 4 +-
pjlib/src/pjlib-test/activesock.c | 4 +-
pjlib/src/pjlib-test/atomic.c | 4 +-
pjlib/src/pjlib-test/echo_clt.c | 4 +-
pjlib/src/pjlib-test/errno.c | 4 +-
pjlib/src/pjlib-test/exception.c | 4 +-
pjlib/src/pjlib-test/exception_wrap.cpp | 4 +-
pjlib/src/pjlib-test/fifobuf.c | 4 +-
pjlib/src/pjlib-test/file.c | 4 +-
pjlib/src/pjlib-test/hash_test.c | 4 +-
pjlib/src/pjlib-test/ioq_perf.c | 4 +-
pjlib/src/pjlib-test/ioq_tcp.c | 4 +-
pjlib/src/pjlib-test/ioq_udp.c | 4 +-
pjlib/src/pjlib-test/ioq_unreg.c | 4 +-
pjlib/src/pjlib-test/list.c | 4 +-
pjlib/src/pjlib-test/main.c | 4 +-
pjlib/src/pjlib-test/main_mod.c | 4 +-
pjlib/src/pjlib-test/main_rtems.c | 4 +-
pjlib/src/pjlib-test/main_win32.c | 4 +-
pjlib/src/pjlib-test/mutex.c | 4 +-
pjlib/src/pjlib-test/os.c | 28 +-
pjlib/src/pjlib-test/pool.c | 4 +-
pjlib/src/pjlib-test/pool_perf.c | 4 +-
pjlib/src/pjlib-test/pool_wrap.cpp | 4 +-
pjlib/src/pjlib-test/rand.c | 4 +-
pjlib/src/pjlib-test/rbtree.c | 4 +-
pjlib/src/pjlib-test/rtems_network_config.h | 4 +-
pjlib/src/pjlib-test/select.c | 4 +-
pjlib/src/pjlib-test/sleep.c | 4 +-
pjlib/src/pjlib-test/sock.c | 4 +-
pjlib/src/pjlib-test/sock_perf.c | 4 +-
pjlib/src/pjlib-test/ssl_sock.c | 4 +-
pjlib/src/pjlib-test/string.c | 4 +-
pjlib/src/pjlib-test/test.c | 8 +-
pjlib/src/pjlib-test/test.h | 6 +-
pjlib/src/pjlib-test/test_wrap.cpp | 4 +-
pjlib/src/pjlib-test/thread.c | 4 +-
pjlib/src/pjlib-test/timer.c | 4 +-
pjlib/src/pjlib-test/timestamp.c | 4 +-
pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c | 2 +-
pjlib/src/pjlib-test/udp_echo_srv_sync.c | 4 +-
pjlib/src/pjlib-test/util.c | 4 +-
pjmedia/build/Jbtest.dat | 8 +-
pjmedia/include/pjmedia-audiodev/audiodev.h | 18 +-
pjmedia/include/pjmedia-audiodev/audiodev_imp.h | 11 +-
pjmedia/include/pjmedia-audiodev/audiotest.h | 4 +-
pjmedia/include/pjmedia-audiodev/config.h | 4 +-
pjmedia/include/pjmedia-audiodev/errno.h | 4 +-
pjmedia/include/pjmedia-codec.h | 4 +-
pjmedia/include/pjmedia-codec/amr_helper.h | 4 +-
pjmedia/include/pjmedia-codec/config.h | 4 +-
pjmedia/include/pjmedia-codec/g722.h | 4 +-
pjmedia/include/pjmedia-codec/g7221.h | 4 +-
pjmedia/include/pjmedia-codec/gsm.h | 4 +-
pjmedia/include/pjmedia-codec/ilbc.h | 4 +-
pjmedia/include/pjmedia-codec/ipp_codecs.h | 4 +-
pjmedia/include/pjmedia-codec/l16.h | 4 +-
pjmedia/include/pjmedia-codec/passthrough.h | 4 +-
pjmedia/include/pjmedia-codec/speex.h | 4 +-
pjmedia/include/pjmedia-codec/types.h | 5 +-
pjmedia/include/pjmedia.h | 4 +-
pjmedia/include/pjmedia/alaw_ulaw.h | 4 +-
pjmedia/include/pjmedia/bidirectional.h | 4 +-
pjmedia/include/pjmedia/circbuf.h | 4 +-
pjmedia/include/pjmedia/clock.h | 4 +-
pjmedia/include/pjmedia/codec.h | 4 +-
pjmedia/include/pjmedia/conference.h | 4 +-
pjmedia/include/pjmedia/config.h | 15 +-
pjmedia/include/pjmedia/delaybuf.h | 4 +-
pjmedia/include/pjmedia/doxygen.h | 4 +-
pjmedia/include/pjmedia/echo.h | 4 +-
pjmedia/include/pjmedia/echo_port.h | 4 +-
pjmedia/include/pjmedia/endpoint.h | 43 +-
pjmedia/include/pjmedia/errno.h | 4 +-
pjmedia/include/pjmedia/g711.h | 4 +-
pjmedia/include/pjmedia/jbuf.h | 4 +-
pjmedia/include/pjmedia/master_port.h | 4 +-
pjmedia/include/pjmedia/mem_port.h | 4 +-
pjmedia/include/pjmedia/null_port.h | 4 +-
pjmedia/include/pjmedia/plc.h | 4 +-
pjmedia/include/pjmedia/port.h | 4 +-
pjmedia/include/pjmedia/resample.h | 4 +-
pjmedia/include/pjmedia/rtcp.h | 4 +-
pjmedia/include/pjmedia/rtcp_xr.h | 4 +-
pjmedia/include/pjmedia/rtp.h | 4 +-
pjmedia/include/pjmedia/sdp.h | 50 +-
pjmedia/include/pjmedia/sdp_neg.h | 4 +-
pjmedia/include/pjmedia/session.h | 4 +-
pjmedia/include/pjmedia/silencedet.h | 4 +-
pjmedia/include/pjmedia/sound.h | 4 +-
pjmedia/include/pjmedia/sound_port.h | 41 +-
pjmedia/include/pjmedia/splitcomb.h | 4 +-
pjmedia/include/pjmedia/stereo.h | 4 +-
pjmedia/include/pjmedia/stream.h | 14 +-
pjmedia/include/pjmedia/symbian_sound_aps.h | 4 +-
pjmedia/include/pjmedia/tonegen.h | 4 +-
pjmedia/include/pjmedia/transport.h | 4 +-
pjmedia/include/pjmedia/transport_adapter_sample.h | 4 +-
pjmedia/include/pjmedia/transport_ice.h | 4 +-
pjmedia/include/pjmedia/transport_loop.h | 4 +-
pjmedia/include/pjmedia/transport_srtp.h | 4 +-
pjmedia/include/pjmedia/transport_udp.h | 4 +-
pjmedia/include/pjmedia/types.h | 4 +-
pjmedia/include/pjmedia/wav_playlist.h | 4 +-
pjmedia/include/pjmedia/wav_port.h | 4 +-
pjmedia/include/pjmedia/wave.h | 4 +-
pjmedia/include/pjmedia/wsola.h | 4 +-
pjmedia/include/pjmedia_audiodev.h | 4 +-
pjmedia/src/pjmedia-audiodev/alsa_dev.c | 110 +-
pjmedia/src/pjmedia-audiodev/audiodev.c | 62 +-
pjmedia/src/pjmedia-audiodev/audiotest.c | 4 +-
pjmedia/src/pjmedia-audiodev/coreaudio_dev.c | 890 +--
pjmedia/src/pjmedia-audiodev/errno.c | 4 +-
pjmedia/src/pjmedia-audiodev/legacy_dev.c | 15 +-
pjmedia/src/pjmedia-audiodev/null_dev.c | 15 +-
pjmedia/src/pjmedia-audiodev/pa_dev.c | 18 +-
pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp | 15 +-
pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp | 15 +-
pjmedia/src/pjmedia-audiodev/symb_vas_dev.cpp | 15 +-
pjmedia/src/pjmedia-audiodev/wmme_dev.c | 203 +-
pjmedia/src/pjmedia-codec/g722.c | 10 +-
pjmedia/src/pjmedia-codec/g722/g722_dec.c | 4 +-
pjmedia/src/pjmedia-codec/g722/g722_dec.h | 4 +-
pjmedia/src/pjmedia-codec/g722/g722_enc.c | 4 +-
pjmedia/src/pjmedia-codec/g722/g722_enc.h | 4 +-
pjmedia/src/pjmedia-codec/g7221.c | 4 +-
pjmedia/src/pjmedia-codec/gsm.c | 4 +-
pjmedia/src/pjmedia-codec/ilbc.c | 30 +-
pjmedia/src/pjmedia-codec/ipp_codecs.c | 8 +-
pjmedia/src/pjmedia-codec/l16.c | 4 +-
pjmedia/src/pjmedia-codec/passthrough.c | 4 +-
pjmedia/src/pjmedia-codec/speex_codec.c | 4 +-
pjmedia/src/pjmedia/alaw_ulaw_table.c | 4 +-
pjmedia/src/pjmedia/bidirectional.c | 4 +-
pjmedia/src/pjmedia/clock_thread.c | 4 +-
pjmedia/src/pjmedia/codec.c | 27 +-
pjmedia/src/pjmedia/conf_switch.c | 4 +-
pjmedia/src/pjmedia/conference.c | 4 +-
pjmedia/src/pjmedia/delaybuf.c | 4 +-
pjmedia/src/pjmedia/echo_common.c | 4 +-
pjmedia/src/pjmedia/echo_internal.h | 4 +-
pjmedia/src/pjmedia/echo_port.c | 4 +-
pjmedia/src/pjmedia/echo_speex.c | 8 +-
pjmedia/src/pjmedia/echo_suppress.c | 4 +-
pjmedia/src/pjmedia/endpoint.c | 87 +-
pjmedia/src/pjmedia/errno.c | 4 +-
pjmedia/src/pjmedia/g711.c | 4 +-
pjmedia/src/pjmedia/jbuf.c | 39 +-
pjmedia/src/pjmedia/master_port.c | 4 +-
pjmedia/src/pjmedia/mem_capture.c | 4 +-
pjmedia/src/pjmedia/mem_player.c | 4 +-
pjmedia/src/pjmedia/null_port.c | 4 +-
pjmedia/src/pjmedia/plc_common.c | 4 +-
pjmedia/src/pjmedia/port.c | 4 +-
pjmedia/src/pjmedia/resample_libsamplerate.c | 4 +-
pjmedia/src/pjmedia/resample_port.c | 4 +-
pjmedia/src/pjmedia/resample_resample.c | 4 +-
pjmedia/src/pjmedia/resample_speex.c | 4 +-
pjmedia/src/pjmedia/rtcp.c | 4 +-
pjmedia/src/pjmedia/rtcp_xr.c | 4 +-
pjmedia/src/pjmedia/rtp.c | 4 +-
pjmedia/src/pjmedia/sdp.c | 60 +-
pjmedia/src/pjmedia/sdp_cmp.c | 4 +-
pjmedia/src/pjmedia/sdp_neg.c | 4 +-
pjmedia/src/pjmedia/sdp_wrap.cpp | 4 +-
pjmedia/src/pjmedia/session.c | 7 +-
pjmedia/src/pjmedia/silencedet.c | 4 +-
pjmedia/src/pjmedia/sound_legacy.c | 4 +-
pjmedia/src/pjmedia/sound_port.c | 81 +-
pjmedia/src/pjmedia/splitcomb.c | 6 +-
pjmedia/src/pjmedia/stereo_port.c | 4 +-
pjmedia/src/pjmedia/stream.c | 56 +-
pjmedia/src/pjmedia/tonegen.c | 4 +-
pjmedia/src/pjmedia/transport_adapter_sample.c | 4 +-
pjmedia/src/pjmedia/transport_ice.c | 20 +-
pjmedia/src/pjmedia/transport_loop.c | 4 +-
pjmedia/src/pjmedia/transport_srtp.c | 35 +-
pjmedia/src/pjmedia/transport_udp.c | 4 +-
pjmedia/src/pjmedia/wav_player.c | 57 +-
pjmedia/src/pjmedia/wav_playlist.c | 4 +-
pjmedia/src/pjmedia/wav_writer.c | 4 +-
pjmedia/src/pjmedia/wave.c | 4 +-
pjmedia/src/pjmedia/wsola.c | 4 +-
pjmedia/src/test/audio_tool.c | 4 +-
pjmedia/src/test/codec_vectors.c | 4 +-
pjmedia/src/test/jbuf_test.c | 4 +-
pjmedia/src/test/main.c | 4 +-
pjmedia/src/test/mips_test.c | 4 +-
pjmedia/src/test/rtp_test.c | 4 +-
pjmedia/src/test/sdp_neg_test.c | 4 +-
pjmedia/src/test/sdptest.c | 4 +-
pjmedia/src/test/session_test.c | 4 +-
pjmedia/src/test/test.c | 4 +-
pjmedia/src/test/test.h | 4 +-
pjmedia/src/test/wince_main.c | 4 +-
pjmedia/src/test/wsola_test.c | 19 -
pjnath/docs/doc_ice.h | 4 +-
pjnath/docs/doc_mainpage.h | 4 +-
pjnath/docs/doc_nat.h | 4 +-
pjnath/docs/doc_samples.h | 4 +-
pjnath/docs/doc_stun.h | 4 +-
pjnath/docs/doc_turn.h | 4 +-
pjnath/include/pjnath.h | 4 +-
pjnath/include/pjnath/config.h | 4 +-
pjnath/include/pjnath/errno.h | 4 +-
pjnath/include/pjnath/ice_session.h | 4 +-
pjnath/include/pjnath/ice_strans.h | 4 +-
pjnath/include/pjnath/nat_detect.h | 4 +-
pjnath/include/pjnath/stun_auth.h | 4 +-
pjnath/include/pjnath/stun_config.h | 4 +-
pjnath/include/pjnath/stun_msg.h | 4 +-
pjnath/include/pjnath/stun_session.h | 4 +-
pjnath/include/pjnath/stun_sock.h | 4 +-
pjnath/include/pjnath/stun_transaction.h | 4 +-
pjnath/include/pjnath/turn_session.h | 4 +-
pjnath/include/pjnath/turn_sock.h | 4 +-
pjnath/include/pjnath/types.h | 4 +-
pjnath/src/pjnath-test/ice_test.c | 4 +-
pjnath/src/pjnath-test/main.c | 4 +-
pjnath/src/pjnath-test/server.c | 4 +-
pjnath/src/pjnath-test/server.h | 4 +-
pjnath/src/pjnath-test/sess_auth.c | 4 +-
pjnath/src/pjnath-test/stun.c | 4 +-
pjnath/src/pjnath-test/stun_sock_test.c | 4 +-
pjnath/src/pjnath-test/test.c | 4 +-
pjnath/src/pjnath-test/test.h | 4 +-
pjnath/src/pjnath-test/turn_sock_test.c | 4 +-
pjnath/src/pjnath/errno.c | 12 +-
pjnath/src/pjnath/ice_session.c | 11 +-
pjnath/src/pjnath/ice_strans.c | 4 +-
pjnath/src/pjnath/nat_detect.c | 4 +-
pjnath/src/pjnath/stun_auth.c | 4 +-
pjnath/src/pjnath/stun_msg.c | 4 +-
pjnath/src/pjnath/stun_msg_dump.c | 4 +-
pjnath/src/pjnath/stun_session.c | 4 +-
pjnath/src/pjnath/stun_sock.c | 4 +-
pjnath/src/pjnath/stun_transaction.c | 4 +-
pjnath/src/pjnath/turn_session.c | 4 +-
pjnath/src/pjnath/turn_sock.c | 4 +-
pjnath/src/pjturn-client/client_main.c | 8 +-
pjnath/src/pjturn-srv/allocation.c | 4 +-
pjnath/src/pjturn-srv/auth.c | 4 +-
pjnath/src/pjturn-srv/auth.h | 4 +-
pjnath/src/pjturn-srv/listener_tcp.c | 4 +-
pjnath/src/pjturn-srv/listener_udp.c | 4 +-
pjnath/src/pjturn-srv/main.c | 4 +-
pjnath/src/pjturn-srv/server.c | 4 +-
pjnath/src/pjturn-srv/turn.h | 4 +-
.../src/ipjsua/Classes/ConfigViewController.h | 26 +-
.../src/ipjsua/Classes/ConfigViewController.m | 26 +-
.../src/ipjsua/Classes/FirstViewController.h | 26 +-
.../src/ipjsua/Classes/FirstViewController.m | 28 +-
pjsip-apps/src/ipjsua/Classes/TabBarController.h | 26 +-
pjsip-apps/src/ipjsua/Classes/TabBarController.m | 26 +-
pjsip-apps/src/ipjsua/Classes/ipjsuaAppDelegate.h | 26 +-
pjsip-apps/src/ipjsua/Classes/ipjsuaAppDelegate.m | 26 +-
pjsip-apps/src/ipjsua/main.m | 26 +-
.../src/ipjsystest/Classes/RootViewController.h | 26 +-
.../src/ipjsystest/Classes/RootViewController.m | 26 +-
.../src/ipjsystest/Classes/TestViewController.h | 26 +-
.../src/ipjsystest/Classes/TestViewController.m | 26 +-
.../src/ipjsystest/Classes/ipjsystestAppDelegate.h | 26 +-
.../src/ipjsystest/Classes/ipjsystestAppDelegate.m | 26 +-
pjsip-apps/src/ipjsystest/main.m | 26 +-
pjsip-apps/src/pjsua/gui.h | 4 +-
pjsip-apps/src/pjsua/main.c | 16 +-
pjsip-apps/src/pjsua/pjsua_app.c | 55 +-
pjsip-apps/src/pjsystest/gui.h | 4 +-
pjsip-apps/src/pjsystest/main_console.c | 4 +-
pjsip-apps/src/pjsystest/main_wm.c | 4 +-
pjsip-apps/src/pjsystest/systest.c | 4 +-
pjsip-apps/src/pjsystest/systest.h | 4 +-
pjsip-apps/src/py_pjsua/py_pjsua.c | 4 +-
pjsip-apps/src/py_pjsua/py_pjsua.h | 4 +-
pjsip-apps/src/python/Makefile | 7 +-
pjsip-apps/src/python/_pjsua.c | 4 +-
pjsip-apps/src/python/_pjsua.h | 14 +-
pjsip-apps/src/samples/aectest.c | 4 +-
pjsip-apps/src/samples/auddemo.c | 10 +-
pjsip-apps/src/samples/confbench.c | 4 +-
pjsip-apps/src/samples/confsample.c | 4 +-
pjsip-apps/src/samples/debug.c | 4 +-
pjsip-apps/src/samples/encdec.c | 4 +-
pjsip-apps/src/samples/footprint.c | 4 +-
pjsip-apps/src/samples/httpdemo.c | 4 +-
pjsip-apps/src/samples/icedemo.c | 4 +-
pjsip-apps/src/samples/invtester.c | 4 +-
pjsip-apps/src/samples/jbsim.c | 4 +-
pjsip-apps/src/samples/latency.c | 9 +-
pjsip-apps/src/samples/level.c | 4 +-
pjsip-apps/src/samples/mix.c | 4 +-
pjsip-apps/src/samples/pcaputil.c | 15 +-
pjsip-apps/src/samples/pjsip-perf.c | 4 +-
pjsip-apps/src/samples/playfile.c | 4 +-
pjsip-apps/src/samples/playsine.c | 4 +-
pjsip-apps/src/samples/proxy.h | 4 +-
pjsip-apps/src/samples/recfile.c | 4 +-
pjsip-apps/src/samples/resampleplay.c | 4 +-
pjsip-apps/src/samples/simple_pjsua.c | 4 +-
pjsip-apps/src/samples/simpleua.c | 4 +-
pjsip-apps/src/samples/siprtp.c | 4 +-
pjsip-apps/src/samples/siprtp_report.c | 4 +-
pjsip-apps/src/samples/sipstateless.c | 4 +-
pjsip-apps/src/samples/stateful_proxy.c | 4 +-
pjsip-apps/src/samples/stateless_proxy.c | 4 +-
pjsip-apps/src/samples/stereotest.c | 4 +-
pjsip-apps/src/samples/streamutil.c | 4 +-
pjsip-apps/src/samples/strerror.c | 4 +-
pjsip-apps/src/samples/tonegen.c | 4 +-
pjsip-apps/src/samples/util.h | 20 +-
pjsip-apps/src/symbian_ua/main_symbian.cpp | 4 +-
pjsip-apps/src/symbian_ua/ua.cpp | 4 +-
pjsip-apps/src/symbian_ua/ua.h | 4 +-
.../src/symbian_ua_gui/group/symbian_ua_gui.mmp | 1 -
.../inc/Symbian_ua_guiSettingItemListSettings.h | 136 +-
pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h | 2 +-
.../src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h | 248 +-
.../symbian_ua_gui/inc/symbian_ua_guiApplication.h | 80 +-
.../symbian_ua_gui/inc/symbian_ua_guiContainer.h | 236 +-
.../inc/symbian_ua_guiContainerView.h | 186 +-
.../symbian_ua_gui/inc/symbian_ua_guiDocument.h | 82 +-
.../inc/symbian_ua_guiSettingItemList.h | 184 +-
.../inc/symbian_ua_guiSettingItemListView.h | 180 +-
.../src/Symbian_ua_guiSettingItemListSets.cpp | 298 +-
pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp | 2 +-
.../src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp | 504 +-
.../src/symbian_ua_guiApplication.cpp | 182 +-
.../symbian_ua_gui/src/symbian_ua_guiContainer.cpp | 580 +-
.../src/symbian_ua_guiContainerView.cpp | 966 +-
.../symbian_ua_gui/src/symbian_ua_guiDocument.cpp | 124 +-
.../src/symbian_ua_guiSettingItemList.cpp | 856 +-
.../src/symbian_ua_guiSettingItemListView.cpp | 580 +-
pjsip-apps/src/symsndtest/app_main.cpp | 4 +-
pjsip-apps/src/symsndtest/main_symbian.cpp | 4 +-
pjsip/docs/doxygen.h | 2 +-
pjsip/include/pjsip-simple/errno.h | 4 +-
pjsip/include/pjsip-simple/evsub.h | 17 +-
pjsip/include/pjsip-simple/evsub_msg.h | 4 +-
pjsip/include/pjsip-simple/iscomposing.h | 4 +-
pjsip/include/pjsip-simple/mwi.h | 4 +-
pjsip/include/pjsip-simple/pidf.h | 4 +-
pjsip/include/pjsip-simple/presence.h | 16 +-
pjsip/include/pjsip-simple/publish.h | 4 +-
pjsip/include/pjsip-simple/rpid.h | 4 +-
pjsip/include/pjsip-simple/types.h | 4 +-
pjsip/include/pjsip-simple/xpidf.h | 4 +-
pjsip/include/pjsip-ua/sip_100rel.h | 4 +-
pjsip/include/pjsip-ua/sip_inv.h | 4 +-
pjsip/include/pjsip-ua/sip_regc.h | 18 +-
pjsip/include/pjsip-ua/sip_replaces.h | 4 +-
pjsip/include/pjsip-ua/sip_timer.h | 4 +-
pjsip/include/pjsip-ua/sip_xfer.h | 4 +-
pjsip/include/pjsip.h | 4 +-
pjsip/include/pjsip/print_util.h | 4 +-
pjsip/include/pjsip/sip_auth.h | 16 +-
pjsip/include/pjsip/sip_auth_aka.h | 4 +-
pjsip/include/pjsip/sip_auth_msg.h | 4 +-
pjsip/include/pjsip/sip_auth_parser.h | 4 +-
pjsip/include/pjsip/sip_config.h | 26 +-
pjsip/include/pjsip/sip_dialog.h | 4 +-
pjsip/include/pjsip/sip_endpoint.h | 4 +-
pjsip/include/pjsip/sip_errno.h | 4 +-
pjsip/include/pjsip/sip_event.h | 4 +-
pjsip/include/pjsip/sip_module.h | 4 +-
pjsip/include/pjsip/sip_msg.h | 4 +-
pjsip/include/pjsip/sip_multipart.h | 4 +-
pjsip/include/pjsip/sip_parser.h | 4 +-
pjsip/include/pjsip/sip_private.h | 4 +-
pjsip/include/pjsip/sip_resolve.h | 4 +-
pjsip/include/pjsip/sip_tel_uri.h | 4 +-
pjsip/include/pjsip/sip_transaction.h | 4 +-
pjsip/include/pjsip/sip_transport.h | 4 +-
pjsip/include/pjsip/sip_transport_loop.h | 4 +-
pjsip/include/pjsip/sip_transport_tcp.h | 4 +-
pjsip/include/pjsip/sip_transport_tls.h | 4 +-
pjsip/include/pjsip/sip_transport_udp.h | 4 +-
pjsip/include/pjsip/sip_types.h | 4 +-
pjsip/include/pjsip/sip_ua_layer.h | 4 +-
pjsip/include/pjsip/sip_uri.h | 4 +-
pjsip/include/pjsip/sip_util.h | 4 +-
pjsip/include/pjsip_auth.h | 4 +-
pjsip/include/pjsip_simple.h | 4 +-
pjsip/include/pjsip_ua.h | 4 +-
pjsip/include/pjsua-lib/pjsua.h | 87 +-
pjsip/include/pjsua-lib/pjsua_internal.h | 16 +-
pjsip/src/pjsip-simple/errno.c | 4 +-
pjsip/src/pjsip-simple/evsub.c | 46 +-
pjsip/src/pjsip-simple/evsub_msg.c | 4 +-
pjsip/src/pjsip-simple/iscomposing.c | 4 +-
pjsip/src/pjsip-simple/mwi.c | 4 +-
pjsip/src/pjsip-simple/pidf.c | 4 +-
pjsip/src/pjsip-simple/presence.c | 70 +-
pjsip/src/pjsip-simple/presence_body.c | 4 +-
pjsip/src/pjsip-simple/publishc.c | 13 +-
pjsip/src/pjsip-simple/rpid.c | 4 +-
pjsip/src/pjsip-simple/xpidf.c | 4 +-
pjsip/src/pjsip-ua/sip_100rel.c | 4 +-
pjsip/src/pjsip-ua/sip_inv.c | 79 +-
pjsip/src/pjsip-ua/sip_reg.c | 99 +-
pjsip/src/pjsip-ua/sip_replaces.c | 4 +-
pjsip/src/pjsip-ua/sip_timer.c | 4 +-
pjsip/src/pjsip-ua/sip_xfer.c | 4 +-
pjsip/src/pjsip/sip_auth_aka.c | 4 +-
pjsip/src/pjsip/sip_auth_client.c | 12 +-
pjsip/src/pjsip/sip_auth_msg.c | 4 +-
pjsip/src/pjsip/sip_auth_parser.c | 4 +-
pjsip/src/pjsip/sip_auth_parser_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_auth_server.c | 4 +-
pjsip/src/pjsip/sip_config.c | 4 +-
pjsip/src/pjsip/sip_dialog.c | 5 +-
pjsip/src/pjsip/sip_dialog_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_endpoint.c | 15 +-
pjsip/src/pjsip/sip_endpoint_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_errno.c | 4 +-
pjsip/src/pjsip/sip_msg.c | 4 +-
pjsip/src/pjsip/sip_multipart.c | 12 +-
pjsip/src/pjsip/sip_parser.c | 9 +-
pjsip/src/pjsip/sip_parser_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_resolve.c | 4 +-
pjsip/src/pjsip/sip_tel_uri.c | 4 +-
pjsip/src/pjsip/sip_tel_uri_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_transaction.c | 4 +-
pjsip/src/pjsip/sip_transport.c | 4 +-
pjsip/src/pjsip/sip_transport_loop.c | 4 +-
pjsip/src/pjsip/sip_transport_tcp.c | 4 +-
pjsip/src/pjsip/sip_transport_tls.c | 6 +-
pjsip/src/pjsip/sip_transport_tls_ossl.c | 4 +-
pjsip/src/pjsip/sip_transport_udp.c | 7 +-
pjsip/src/pjsip/sip_transport_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_ua_layer.c | 4 +-
pjsip/src/pjsip/sip_uri.c | 4 +-
pjsip/src/pjsip/sip_util.c | 8 +-
pjsip/src/pjsip/sip_util_proxy.c | 4 +-
pjsip/src/pjsip/sip_util_proxy_wrap.cpp | 4 +-
pjsip/src/pjsip/sip_util_statefull.c | 4 +-
pjsip/src/pjsip/sip_util_wrap.cpp | 4 +-
pjsip/src/pjsua-lib/pjsua_acc.c | 273 +-
pjsip/src/pjsua-lib/pjsua_call.c | 168 +-
pjsip/src/pjsua-lib/pjsua_core.c | 18 +-
pjsip/src/pjsua-lib/pjsua_im.c | 4 +-
pjsip/src/pjsua-lib/pjsua_media.c | 79 +-
pjsip/src/pjsua-lib/pjsua_pres.c | 5 +-
pjsip/src/test/dlg_core_test.c | 4 +-
pjsip/src/test/dns_test.c | 4 +-
pjsip/src/test/inv_offer_answer_test.c | 4 +-
pjsip/src/test/main.c | 4 +-
pjsip/src/test/msg_err_test.c | 4 +-
pjsip/src/test/msg_logger.c | 4 +-
pjsip/src/test/msg_test.c | 4 +-
pjsip/src/test/multipart_test.c | 4 +-
pjsip/src/test/regc_test.c | 4 +-
pjsip/src/test/test.c | 4 +-
pjsip/src/test/test.h | 4 +-
pjsip/src/test/transport_loop_test.c | 4 +-
pjsip/src/test/transport_tcp_test.c | 4 +-
pjsip/src/test/transport_test.c | 4 +-
pjsip/src/test/transport_udp_test.c | 4 +-
pjsip/src/test/tsx_basic_test.c | 4 +-
pjsip/src/test/tsx_bench.c | 4 +-
pjsip/src/test/tsx_uac_test.c | 4 +-
pjsip/src/test/tsx_uas_test.c | 4 +-
pjsip/src/test/txdata_test.c | 4 +-
pjsip/src/test/uri_test.c | 10 +-
tests/pjsua/run.py | 10 +-
tests/pjsua/scripts-sipp/uas-reinv-glare.xml | 153 -
tests/pjsua/scripts-sipp/uas-reinv-no-media.xml | 116 -
tests/pjsua/tools/cmp_wav.c | 21 +-
third_party/portaudio/LICENSE.txt | 81 -
third_party/portaudio/README.txt | 98 -
third_party/portaudio/SConstruct | 197 -
third_party/portaudio/aclocal.m4 | 6627 -----------
.../portaudio/build/dev-cpp}/.gitignore | 0
third_party/portaudio/build/dev-cpp/Makefile-dll | 78 -
.../portaudio/build/dev-cpp/Makefile-static | 75 -
.../portaudio/build/dev-cpp/portaudio-dll.dev | 209 -
.../portaudio/build/dev-cpp/portaudio-static.dev | 209 -
third_party/portaudio/build/dev-cpp/readme.txt | 23 -
.../portaudio/build/msvc}/.gitignore | 0
third_party/portaudio/build/msvc/portaudio.def | 43 -
third_party/portaudio/build/msvc/portaudio.dsp | 269 -
third_party/portaudio/build/msvc/portaudio.dsw | 29 -
third_party/portaudio/build/msvc/portaudio.sln | 26 -
third_party/portaudio/build/msvc/portaudio.vcproj | 1512 ---
third_party/portaudio/build/msvc/readme.txt | 109 -
.../portaudio/build/scons}/.gitignore | 0
.../portaudio/build/scons/SConscript_common | 30 -
third_party/portaudio/build/scons/SConscript_opts | 91 -
third_party/portaudio/config.sub | 1489 ---
third_party/portaudio/index.html | 105 -
third_party/portaudio/install-sh | 251 -
third_party/portaudio/missing | 360 -
{lib => third_party/portaudio/pablio}/.gitignore | 0
third_party/portaudio/pablio/README.txt | 45 -
third_party/portaudio/pablio/pablio.c | 314 -
third_party/portaudio/pablio/pablio.def | 35 -
third_party/portaudio/pablio/pablio.h | 116 -
third_party/portaudio/pablio/test_rw.c | 105 -
third_party/portaudio/pablio/test_rw_echo.c | 129 -
third_party/portaudio/pablio/test_w_saw.c | 114 -
third_party/portaudio/pablio/test_w_saw8.c | 112 -
third_party/portaudio/portaudio-2.0.pc.in | 12 -
version.mak | 2 +-
736 files changed, 14946 insertions(+), 25495 deletions(-)
delete mode 100644 pjlib/src/pj/os_info.c
delete mode 100644 pjlib/src/pj/os_info_iphone.m
delete mode 100644 pjlib/src/pj/os_info_symbian.cpp
delete mode 100644 tests/pjsua/scripts-sipp/uas-reinv-glare.xml
delete mode 100644 tests/pjsua/scripts-sipp/uas-reinv-no-media.xml
delete mode 100644 third_party/portaudio/LICENSE.txt
delete mode 100644 third_party/portaudio/README.txt
delete mode 100644 third_party/portaudio/SConstruct
delete mode 100644 third_party/portaudio/aclocal.m4
copy {lib => third_party/portaudio/build/dev-cpp}/.gitignore (100%)
delete mode 100644 third_party/portaudio/build/dev-cpp/Makefile-dll
delete mode 100644 third_party/portaudio/build/dev-cpp/Makefile-static
delete mode 100644 third_party/portaudio/build/dev-cpp/portaudio-dll.dev
delete mode 100644 third_party/portaudio/build/dev-cpp/portaudio-static.dev
delete mode 100644 third_party/portaudio/build/dev-cpp/readme.txt
copy {lib => third_party/portaudio/build/msvc}/.gitignore (100%)
delete mode 100644 third_party/portaudio/build/msvc/portaudio.def
delete mode 100644 third_party/portaudio/build/msvc/portaudio.dsp
delete mode 100644 third_party/portaudio/build/msvc/portaudio.dsw
delete mode 100644 third_party/portaudio/build/msvc/portaudio.sln
delete mode 100644 third_party/portaudio/build/msvc/portaudio.vcproj
delete mode 100644 third_party/portaudio/build/msvc/readme.txt
copy {lib => third_party/portaudio/build/scons}/.gitignore (100%)
delete mode 100644 third_party/portaudio/build/scons/SConscript_common
delete mode 100644 third_party/portaudio/build/scons/SConscript_opts
delete mode 100755 third_party/portaudio/config.sub
delete mode 100644 third_party/portaudio/index.html
delete mode 100755 third_party/portaudio/install-sh
delete mode 100755 third_party/portaudio/missing
copy {lib => third_party/portaudio/pablio}/.gitignore (100%)
delete mode 100644 third_party/portaudio/pablio/README.txt
delete mode 100644 third_party/portaudio/pablio/pablio.c
delete mode 100644 third_party/portaudio/pablio/pablio.def
delete mode 100644 third_party/portaudio/pablio/pablio.h
delete mode 100644 third_party/portaudio/pablio/test_rw.c
delete mode 100644 third_party/portaudio/pablio/test_rw_echo.c
delete mode 100644 third_party/portaudio/pablio/test_w_saw.c
delete mode 100644 third_party/portaudio/pablio/test_w_saw8.c
delete mode 100644 third_party/portaudio/portaudio-2.0.pc.in
- Log -----------------------------------------------------------------
commit d8c7dd200994c93820a471388a537b8194d4fa87
Author: David M. Lee <dlee at digium.com>
Date: Mon Oct 24 12:59:00 2011 -0500
Fixed for Ubuntu Oneiric.
In Oneiric, OpenSSL has SSLv2 disabled, which results in link errors
unless you #ifdef appropriately.
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
index f5ccb4c..aabbc5b 100644
--- a/pjlib/src/pj/ssl_sock_ossl.c
+++ b/pjlib/src/pj/ssl_sock_ossl.c
@@ -309,13 +309,24 @@ static pj_status_t init_openssl(void)
STACK_OF(SSL_CIPHER) *sk_cipher;
unsigned i, n;
+#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
meth = (SSL_METHOD*)SSLv23_server_method();
+#endif
+
+#if !defined(OPENSSL_NO_TLS1)
if (!meth)
meth = (SSL_METHOD*)TLSv1_server_method();
+#endif
+
+#if !defined(OPENSSL_NO_SSL3)
if (!meth)
meth = (SSL_METHOD*)SSLv3_server_method();
+#endif
+
+#if !defined(OPENSSL_NO_SSL2)
if (!meth)
meth = (SSL_METHOD*)SSLv2_server_method();
+#endif
pj_assert(meth);
ctx=SSL_CTX_new(meth);
@@ -489,18 +500,26 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock)
/* Determine SSL method to use */
switch (ssock->param.proto) {
case PJ_SSL_SOCK_PROTO_DEFAULT:
+#if !defined(OPENSSL_NO_TLS1)
case PJ_SSL_SOCK_PROTO_TLS1:
ssl_method = (SSL_METHOD*)TLSv1_method();
break;
+#endif
+#if !defined(OPENSSL_NO_SSL2)
case PJ_SSL_SOCK_PROTO_SSL2:
ssl_method = (SSL_METHOD*)SSLv2_method();
break;
+#endif
+#if !defined(OPENSSL_NO_SSL3)
case PJ_SSL_SOCK_PROTO_SSL3:
ssl_method = (SSL_METHOD*)SSLv3_method();
break;
+#endif
+#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
case PJ_SSL_SOCK_PROTO_SSL23:
ssl_method = (SSL_METHOD*)SSLv23_method();
break;
+#endif
//case PJ_SSL_SOCK_PROTO_DTLS1:
//ssl_method = (SSL_METHOD*)DTLSv1_method();
//break;
-----------------------------------------------------------------------
--
asterisk-scf/integration/pjproject.git
More information about the asterisk-scf-commits
mailing list