From 1fbfa824ae0cac8bc700b11c30c5bbdc88bdf79a Mon Sep 17 00:00:00 2001 From: smorlat Date: Wed, 3 Mar 2010 11:07:25 +0100 Subject: [PATCH] fix compilation problems on macosx --- console/linphonec.h | 2 +- gtk-glade/Makefile.am | 3 ++- mediastreamer2 | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/console/linphonec.h b/console/linphonec.h index 732c99a6a..90b6f6842 100644 --- a/console/linphonec.h +++ b/console/linphonec.h @@ -46,7 +46,7 @@ #endif #endif - +#undef PARAMS /************************************************************************** * * Compile-time defines diff --git a/gtk-glade/Makefile.am b/gtk-glade/Makefile.am index 4a744249c..8af8be66d 100644 --- a/gtk-glade/Makefile.am +++ b/gtk-glade/Makefile.am @@ -78,8 +78,9 @@ endif AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \ -I$(top_srcdir)/mediastreamer2/include/ \ + $(ORTP_CFLAGS) \ $(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \ - $(ORTP_CFLAGS) $(OSIP_CFLAGS) + $(OSIP_CFLAGS) version_date.h: $(top_srcdir)/configure.in diff --git a/mediastreamer2 b/mediastreamer2 index aa90f1de0..2e18cdfe5 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit aa90f1de02e1bdb32f0efb02a71e228659075204 +Subproject commit 2e18cdfe53230763907f3f9b55adeb4c16d396a7