[PATCH] libosmo-abis[master]: configure: Fix compilation with new libortp

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Fri Mar 24 17:35:37 UTC 2017


Review at  https://gerrit.osmocom.org/2164

configure: Fix compilation with new libortp

Commit 0c8d9ddaea8c1afdc0e9b8c37a31c9d158e57efd in ortp broke old API:
function ortp_set_log_level_mask requires one new parameter 'domain'.

This commit fixes compilation in my Archlinux box using ortp 1.0.1.

Change-Id: I46e565f1873c7baf3c3b0aafe73951d20ce083b4
Signed-off-by: Pau Espin Pedrol <pespin.shar at gmail.com>
---
M configure.ac
M src/trau/osmo_ortp.c
2 files changed, 21 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/64/2164/1

diff --git a/configure.ac b/configure.ac
index 99d83f6..ad45f3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,16 @@
 	CPPFLAGS+=" -fsanitize=address -fsanitize=undefined"
 fi
 
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#include <ortp/ortp.h>]],
+			[[ortp_set_log_level_mask(NULL, 0xffff);]]
+	)],
+	[AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [1],
+		[ortp_set_log_level_mask requires domain parameter])],
+	[AC_DEFINE([HAVE_ORTP_LOG_DOMAIN], [0],
+		[ortp_set_log_level_mask has no domain parameter])])
+
 AC_OUTPUT(
 	libosmoabis.pc
 	libosmotrau.pc
diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c
index d4d4ff5..7677fa5 100644
--- a/src/trau/osmo_ortp.c
+++ b/src/trau/osmo_ortp.c
@@ -94,8 +94,11 @@
 	return LOGL_ERROR;
 }
 
-static void my_ortp_logfn(OrtpLogLevel lev, const char *fmt,
-			  va_list args)
+static void my_ortp_logfn(
+#if HAVE_ORTP_LOG_DOMAIN
+	const char *domain,
+#endif
+	OrtpLogLevel lev, const char *fmt, va_list args)
 {
 	osmo_vlogp(DLMIB, ortp_to_osmo_lvl(lev), __FILE__, 0,
 		   0, fmt, args);
@@ -273,7 +276,12 @@
 	tall_rtp_ctx = ctx;
 	ortp_set_memory_functions(&osmo_ortp_memfn);
 	ortp_init();
-	ortp_set_log_level_mask(0xffff);
+	ortp_set_log_level_mask(
+#if HAVE_ORTP_LOG_DOMAIN
+		ORTP_LOG_DOMAIN,
+#endif
+		 0xffff);
+
 	ortp_set_log_handler(my_ortp_logfn);
 	create_payload_types();
 }

-- 
To view, visit https://gerrit.osmocom.org/2164
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I46e565f1873c7baf3c3b0aafe73951d20ce083b4
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin.shar at gmail.com>



More information about the gerrit-log mailing list