[MERGED] libosmo-abis[master]: configure.ac: Fix RTP_SIGNAL_PTR_CAST config in FreeBSD build

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/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Jul 13 20:56:10 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: configure.ac: Fix RTP_SIGNAL_PTR_CAST config in FreeBSD build
......................................................................


configure.ac: Fix RTP_SIGNAL_PTR_CAST config in FreeBSD build

Move function definition to the first argument of AC_LANG_PROGRAM
(prologue) instead of the second (body). Content of the body is writen
into the main() function of the file being compiled, while prologue is
writen before it.

Compiler from FreeBSD build host doesn't like definitions inside the
main function, it fails with the following error:
conftest.c:28:73: error: function definition is not allowed here

As the compilation test fails, unsigned int is used instead of void*, which
doesn't match the current headers in the current build, and then a
warning (or error with -Werror) is printed.

Change-Id: I83fc3997e5067b499bf43cea4ff953604d6cbeae
---
M configure.ac
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index 9b62f3e..0686f64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,8 +79,9 @@
 CFLAGS="$CFLAGS $ORTP_CFLAGS"
 AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM(
-		[[#include <ortp/ortp.h>]],
-		[[void fake_cb(struct _RtpSession *r, void *arg1, void *arg2, void *arg3) { return; } rtp_session_signal_connect(NULL, "", fake_cb, (void*) fake_cb);]]
+		[[#include <ortp/ortp.h>
+		void fake_cb(struct _RtpSession *r, void *arg1, void *arg2, void *arg3) { return; }]],
+		[[rtp_session_signal_connect(NULL, "", fake_cb, (void*) fake_cb);]]
 	)],
 	[AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(void*)(arg)],
 		[rtp_session_signal_connect requires pointer parameter])],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83fc3997e5067b499bf43cea4ff953604d6cbeae
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list