From 962dc37d4f6c72fc8b348d227b3c91885fd236dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 26 May 2022 14:08:55 +0100 Subject: [PATCH] webrtc: fix build with older libnice versions 1) check for right macro name when checking for NICE_VERSION_CHECK 2) if libnice version is 0.1.18.1 this should not satisfy a NICE_VERSION_CHECK(0,1,19). Fixes build with libnice 0.1.18.1 subproject checkout. Part-of: --- subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c index 04adc8f..6aa632f 100644 --- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c +++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c @@ -27,14 +27,12 @@ #include "icestream.h" #include "nicetransport.h" -#ifndef NICE_CHECH_VERSION -#define NICE_CHECK_VERSION(major, minor, micro) \ +#ifndef NICE_CHECK_VERSION +#define NICE_CHECK_VERSION(major,minor,micro) \ (NICE_VERSION_MAJOR > (major) || \ (NICE_VERSION_MAJOR == (major) && NICE_VERSION_MINOR > (minor)) || \ (NICE_VERSION_MAJOR == (major) && NICE_VERSION_MINOR == (minor) && \ - NICE_VERSION_MICRO >= (micro)) || \ - (NICE_VERSION_MAJOR == (major) && NICE_VERSION_MINOR == (minor) && \ - NICE_VERSION_MICRO + 1 == (micro) && NICE_VERSION_NANO > 0)) + NICE_VERSION_MICRO >= (micro))) #endif /* XXX: -- 2.7.4