summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-29 17:08:43 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-29 17:08:43 (GMT)
commit6553314dde640e1ef7a37c4e630156cd027159db (patch)
tree8358d25220251b37cd61125edf1f60288502631f
parent10e6385ebccab96ef254f62271b0f19d3d5be3cf (diff)
downloadfarstream-6553314dde640e1ef7a37c4e630156cd027159db.tar.gz
farstream-6553314dde640e1ef7a37c4e630156cd027159db.tar.xz
Require GLib 2.30, do not allow APIs added after and ignore later deprecations
-rw-r--r--configure.ac5
-rw-r--r--transmitters/multicast/fs-multicast-transmitter.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 6b37d8c..f226027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,10 @@ dnl *** checks for library functions ***
dnl *** checks for dependency libraries ***
dnl GLib is required
-AG_GST_GLIB_CHECK([2.26])
+AG_GST_GLIB_CHECK([2.30])
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
+AC_DEFINE(GLIB_VERSION_MAX_REQUIRED, GLIB_VERSION_2_30, [Prevent post 2.30 APIs])
+
PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.16)
AC_SUBST(GIO_UNIX_CFLAGS)
diff --git a/transmitters/multicast/fs-multicast-transmitter.c b/transmitters/multicast/fs-multicast-transmitter.c
index fd1f2fa..a02046c 100644
--- a/transmitters/multicast/fs-multicast-transmitter.c
+++ b/transmitters/multicast/fs-multicast-transmitter.c
@@ -1132,7 +1132,7 @@ fs_multicast_transmitter_put_udpsock (FsMulticastTransmitter *trans,
void
fs_multicast_transmitter_udpsock_inc_sending (UdpSock *udpsock)
{
- if (g_atomic_int_exchange_and_add (&udpsock->sendcount, 1) == 0)
+ if (g_atomic_int_add (&udpsock->sendcount, 1) == 0)
{
if (udpsock->udpsink_recvonly_filter)
g_object_set (udpsock->udpsink_recvonly_filter, "sending", TRUE, NULL);