[vlc-commits] upnp: restore default adapter lookup for Linux and Android

[Felix Paul Kühne]

vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Thu Jul  9 15:12:05 2020 +0200| [dd404ea81ded6f542e19fe47ac54a37f6f9e445a] | committer: Felix Paul Kühne

upnp: restore default adapter lookup for Linux and Android

This addresses a build system regression in a8e6a381 and fixes #24943.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=dd404ea81ded6f542e19fe47ac54a37f6f9e445a
---

 modules/services_discovery/upnp.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 9a905d2496..c00f2ea533 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1539,7 +1539,6 @@ done:
 
 #ifdef __APPLE__
 #include <TargetConditionals.h>
-#endif
 
 #if defined(TARGET_OS_OSX) && TARGET_OS_OSX
 #include <CoreFoundation/CoreFoundation.h>
@@ -1600,7 +1599,8 @@ inline char *getPreferedAdapter()
 
     return returnValue;
 }
-#else
+
+#else /* iOS and tvOS */
 
 inline bool necessaryFlagsSetOnInterface(struct ifaddrs *anInterface)
 {
@@ -1637,6 +1637,15 @@ inline char *getPreferedAdapter()
     return adapterName;
 }
 
+#endif
+
+#else /* *nix and Android */
+
+inline char *getPreferedAdapter()
+{
+    return NULL;
+}
+
 #endif
 #else