diff options
30 files changed, 114 insertions, 69 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ac6e37 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*-auto.mak +*.depend +*_auto.h +build.mak +config.log +config.status +pjlib/include/pj/config_site.h +pjsip/include/pjsip/sip_autoconf.h @@ -4143,6 +4143,51 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5 +$as_echo_n "checking for sin in -lm... " >&6; } +if test "${ac_cv_lib_m_sin+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sin (); +int +main () +{ +return sin (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_sin=yes +else + ac_cv_lib_m_sin=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5 +$as_echo "$ac_cv_lib_m_sin" >&6; } +if test "x$ac_cv_lib_m_sin" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF + + LIBS="-lm $LIBS" + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5 $as_echo_n "checking for uuid_generate in -luuid... " >&6; } if ${ac_cv_lib_uuid_uuid_generate+:} false; then : @@ -4928,51 +4973,6 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if floating point is disabled... no" >&5 $as_echo "Checking if floating point is disabled... no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fmod in -lm" >&5 -$as_echo_n "checking for fmod in -lm... " >&6; } -if ${ac_cv_lib_m_fmod+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char fmod (); -int -main () -{ -return fmod (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_fmod=yes -else - ac_cv_lib_m_fmod=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fmod" >&5 -$as_echo "$ac_cv_lib_m_fmod" >&6; } -if test "x$ac_cv_lib_m_fmod" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -fi - fi diff --git a/aconfigure.ac b/aconfigure.ac index e2122a8..df99edd 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -114,6 +114,7 @@ AC_CHECK_LIB(winmm,puts) AC_CHECK_LIB(socket,puts) AC_CHECK_LIB(rt,puts) AC_CHECK_LIB(nsl,puts) +AC_CHECK_LIB(m,sin) AC_CHECK_LIB(uuid,uuid_generate) AC_CHECK_LIB(uuid,uuid_generate,[ac_has_uuid_lib=1]) @@ -186,7 +187,6 @@ AC_ARG_ENABLE(floating-point, [ AC_DEFINE(PJ_HAS_FLOATING_POINT,1) AC_MSG_RESULT([Checking if floating point is disabled... no]) - AC_CHECK_LIB(m,fmod) ]) diff --git a/pjlib-util/bin/.gitignore b/pjlib-util/bin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjlib-util/bin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjlib-util/build/output/.gitignore b/pjlib-util/build/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjlib-util/build/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjlib-util/lib/.gitignore b/pjlib-util/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjlib-util/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjlib/bin/.gitignore b/pjlib/bin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjlib/bin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjlib/build/output/.gitignore b/pjlib/build/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjlib/build/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjlib/lib/.gitignore b/pjlib/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjlib/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjlib/src/pj/log.c b/pjlib/src/pj/log.c index 04173eb..e06ac7b 100644 --- a/pjlib/src/pj/log.c +++ b/pjlib/src/pj/log.c @@ -106,7 +106,7 @@ static void log_set_indent(int indent) pj_thread_local_set(thread_indent_tls_id, (void*)(long)indent); } -static int log_get_raw_indent() +static int log_get_raw_indent(void) { return (long)pj_thread_local_get(thread_indent_tls_id); } @@ -118,13 +118,13 @@ static void log_set_indent(int indent) if (log_indent < 0) log_indent = 0; } -static int log_get_raw_indent() +static int log_get_raw_indent(void) { return log_indent; } #endif /* PJ_LOG_ENABLE_INDENT && PJ_HAS_THREADS */ -static int log_get_indent() +static int log_get_indent(void) { int indent = log_get_raw_indent(); return indent > LOG_MAX_INDENT ? LOG_MAX_INDENT : indent; diff --git a/pjlib/src/pj/pool_buf.c b/pjlib/src/pj/pool_buf.c index b9044b2..0d4c8a6 100644 --- a/pjlib/src/pj/pool_buf.c +++ b/pjlib/src/pj/pool_buf.c @@ -43,7 +43,7 @@ static void pool_buf_cleanup(void) is_initialized = 0; } -static pj_status_t pool_buf_initialize() +static pj_status_t pool_buf_initialize(void) { pj_atexit(&pool_buf_cleanup); diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index 4b1d0a7..483c3e1 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -614,8 +614,8 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) /* Setup SSL BIOs */ ssock->ossl_rbio = BIO_new(BIO_s_mem()); ssock->ossl_wbio = BIO_new(BIO_s_mem()); - BIO_set_close(ssock->ossl_rbio, BIO_CLOSE); - BIO_set_close(ssock->ossl_wbio, BIO_CLOSE); + (void)BIO_set_close(ssock->ossl_rbio, BIO_CLOSE); + (void)BIO_set_close(ssock->ossl_wbio, BIO_CLOSE); SSL_set_bio(ssock->ossl_ssl, ssock->ossl_rbio, ssock->ossl_wbio); return PJ_SUCCESS; @@ -1277,7 +1277,7 @@ static pj_status_t flush_write_bio(pj_ssl_sock_t *ssock, pj_memcpy(&wdata->data, data, len); /* Reset write BIO */ - BIO_reset(ssock->ossl_wbio); + (void)BIO_reset(ssock->ossl_wbio); /* Ticket #1573: Don't hold mutex while calling PJLIB socket send(). */ pj_lock_release(ssock->write_mutex); diff --git a/pjmedia/bin/.gitignore b/pjmedia/bin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjmedia/bin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjmedia/build/output/.gitignore b/pjmedia/build/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjmedia/build/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjmedia/lib/.gitignore b/pjmedia/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjmedia/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjmedia/src/test/test.c b/pjmedia/src/test/test.c index 44b46c3..9dc3006 100644 --- a/pjmedia/src/test/test.c +++ b/pjmedia/src/test/test.c @@ -47,10 +47,10 @@ void app_perror(pj_status_t status, const char *msg) * https://trac.pjsip.org/repos/ticket/1337 */ #if PJMEDIA_HAS_G711_CODEC==0 -int dummy() +void *dummy() { // Dummy - return (int) &pjmedia_plc_save; + return &pjmedia_plc_save; } #endif diff --git a/pjnath/bin/.gitignore b/pjnath/bin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjnath/bin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjnath/build/output/.gitignore b/pjnath/build/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjnath/build/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjnath/lib/.gitignore b/pjnath/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjnath/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjsip-apps/bin/.gitignore b/pjsip-apps/bin/.gitignore new file mode 100644 index 0000000..a8dc7a8 --- /dev/null +++ b/pjsip-apps/bin/.gitignore @@ -0,0 +1 @@ +pj* diff --git a/pjsip-apps/bin/samples/.gitignore b/pjsip-apps/bin/samples/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjsip-apps/bin/samples/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjsip-apps/build/output/.gitignore b/pjsip-apps/build/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjsip-apps/build/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjsip-apps/src/samples/icedemo.c b/pjsip-apps/src/samples/icedemo.c index 598ab1b..10c2b1a 100644 --- a/pjsip-apps/src/samples/icedemo.c +++ b/pjsip-apps/src/samples/icedemo.c @@ -514,9 +514,9 @@ static void icedemo_stop_session(void) reset_rem_info(); } -#define PRINT(fmt, arg0, arg1, arg2, arg3, arg4, arg5) \ +#define PRINT(...) \ printed = pj_ansi_snprintf(p, maxlen - (p-buffer), \ - fmt, arg0, arg1, arg2, arg3, arg4, arg5); \ + __VA_ARGS__); \ if (printed <= 0) return -PJ_ETOOSMALL; \ p += printed @@ -539,8 +539,7 @@ static int print_cand(char buffer[], unsigned maxlen, (unsigned)pj_sockaddr_get_port(&cand->addr)); PRINT("%s\n", - pj_ice_get_cand_type_name(cand->type), - 0, 0, 0, 0, 0); + pj_ice_get_cand_type_name(cand->type)); if (p == buffer+maxlen) return -PJ_ETOOSMALL; @@ -562,8 +561,7 @@ static int encode_session(char buffer[], unsigned maxlen) pj_status_t status; /* Write "dummy" SDP v=, o=, s=, and t= lines */ - PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n", - 0, 0, 0, 0, 0, 0); + PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n"); /* Get ufrag and pwd from current session */ pj_ice_strans_get_ufrag_pwd(icedemo.icest, &local_ufrag, &local_pwd, @@ -574,8 +572,7 @@ static int encode_session(char buffer[], unsigned maxlen) (int)local_ufrag.slen, local_ufrag.ptr, (int)local_pwd.slen, - local_pwd.ptr, - 0, 0); + local_pwd.ptr); /* Write each component */ for (comp=0; comp<icedemo.opt.comp_cnt; ++comp) { @@ -595,22 +592,19 @@ static int encode_session(char buffer[], unsigned maxlen) "c=IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } else if (comp==1) { /* For component 2, default address is in a=rtcp line */ PRINT("a=rtcp:%d IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } else { /* For other components, we'll just invent this.. */ PRINT("a=Xice-defcand:%d IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } /* Enumerate all candidates for this component */ diff --git a/pjsip/bin/.gitignore b/pjsip/bin/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjsip/bin/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjsip/build/output/.gitignore b/pjsip/build/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjsip/build/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/pjsip/lib/.gitignore b/pjsip/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/pjsip/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/third_party/build/milenage/output/.gitignore b/third_party/build/milenage/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/third_party/build/milenage/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/third_party/build/resample/output/.gitignore b/third_party/build/resample/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/third_party/build/resample/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/third_party/build/srtp/output/.gitignore b/third_party/build/srtp/output/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/third_party/build/srtp/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/third_party/lib/.gitignore b/third_party/lib/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/third_party/lib/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore |