summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore8
-rwxr-xr-xaconfigure246
-rw-r--r--aconfigure.ac16
-rw-r--r--build/cc-auto.mak.in1
-rw-r--r--build/rules.mak1
-rw-r--r--pjlib-util/bin/.gitignore2
-rw-r--r--pjlib-util/build/output/.gitignore2
-rw-r--r--pjlib-util/lib/.gitignore2
-rw-r--r--pjlib/bin/.gitignore2
-rw-r--r--pjlib/build/output/.gitignore2
-rw-r--r--pjlib/lib/.gitignore2
-rw-r--r--pjlib/src/pj/log.c6
-rw-r--r--pjlib/src/pj/pool_buf.c2
-rw-r--r--pjlib/src/pj/ssl_sock_ossl.c6
-rw-r--r--pjmedia/bin/.gitignore2
-rw-r--r--pjmedia/build/output/.gitignore2
-rw-r--r--pjmedia/lib/.gitignore2
-rw-r--r--pjmedia/src/test/test.c4
-rw-r--r--pjnath/bin/.gitignore2
-rw-r--r--pjnath/build/output/.gitignore2
-rw-r--r--pjnath/lib/.gitignore2
-rw-r--r--pjsip-apps/bin/.gitignore1
-rw-r--r--pjsip-apps/bin/samples/.gitignore2
-rw-r--r--pjsip-apps/build/output/.gitignore2
-rw-r--r--pjsip-apps/src/samples/icedemo.c22
-rw-r--r--pjsip/bin/.gitignore2
-rw-r--r--pjsip/build/output/.gitignore2
-rw-r--r--pjsip/lib/.gitignore2
-rw-r--r--third_party/build/milenage/output/.gitignore2
-rw-r--r--third_party/build/resample/output/.gitignore2
-rw-r--r--third_party/build/srtp/output/.gitignore2
-rw-r--r--third_party/lib/.gitignore2
32 files changed, 315 insertions, 40 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
diff --git a/aconfigure b/aconfigure
index d3a089b..1ea3ddb 100755
--- a/aconfigure
+++ b/aconfigure
@@ -661,10 +661,12 @@ CC_INC
CC_OUT
LIBEXT2
LIBEXT
-RANLIB
LDOUT
LD
+AR_FLAGS
+ac_ct_AR
AR
+RANLIB
ac_ct_CXX
CXXFLAGS
CXX
@@ -3512,18 +3514,205 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -z "$CROSS_COMPILE"; then
- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar gar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar gar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+fi
+
+
+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
if test "$LD" = ""; then LD="$CC"; fi
if test "$LDOUT" = ""; then LDOUT="-o "; fi
-if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
-
if test "$OBJEXT" = ""; then OBJEXT='o'; fi
if test "$LIBEXT" = ""; then LIBEXT='a'; fi
@@ -3941,6 +4130,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 test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
diff --git a/aconfigure.ac b/aconfigure.ac
index 58f1c1a..75aa01b 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -41,21 +41,15 @@ AC_PROG_CC
AC_PROG_CXX
AC_LANG_C
-dnl #
-dnl # Setup CROSS_COMPILE variable
-dnl #
-if test -z "$CROSS_COMPILE"; then
- CROSS_COMPILE=`echo ${CC} | sed 's/gcc//'`
-fi
+AC_PROG_RANLIB
+AC_CHECK_TOOLS([AR], [ar gar], :)
-if test "$AR" = ""; then AR="${CROSS_COMPILE}ar rv"; fi
-AC_SUBST(AR)
+if test "$AR_FLAGS" = ""; then AR_FLAGS="rv"; fi
+AC_SUBST(AR_FLAGS)
if test "$LD" = ""; then LD="$CC"; fi
AC_SUBST(LD)
if test "$LDOUT" = ""; then LDOUT="-o "; fi
AC_SUBST(LDOUT)
-if test "$RANLIB" = ""; then RANLIB="${CROSS_COMPILE}ranlib"; fi
-AC_SUBST(RANLIB)
if test "$OBJEXT" = ""; then OBJEXT='o'; fi
AC_SUBST(OBJEXT)
if test "$LIBEXT" = ""; then LIBEXT='a'; fi
@@ -120,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])
@@ -192,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/build/cc-auto.mak.in b/build/cc-auto.mak.in
index bc56567..2530e21 100644
--- a/build/cc-auto.mak.in
+++ b/build/cc-auto.mak.in
@@ -1,6 +1,7 @@
export CC = @CC@ -c
export CXX = @CXX@ -c
export AR = @AR@
+export AR_FLAGS = @AR_FLAGS@
export LD = @LD@
export LDOUT = -o
export RANLIB = @RANLIB@
diff --git a/build/rules.mak b/build/rules.mak
index fcc07f7..dc74f52 100644
--- a/build/rules.mak
+++ b/build/rules.mak
@@ -75,6 +75,7 @@ print_common:
@echo DEPFLAGS=$(DEPFLAGS)
@echo CC=$(CC)
@echo AR=$(AR)
+ @echo AR_FLAGS=$(AR_FLAGS)
@echo RANLIB=$(RANLIB)
print_bin: print_common
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