[vlc-commits] Revert "network: Android has vlc_getaddrinfo_i11e"

Thomas Guillem git at videolan.org
Wed Nov 2 14:16:51 CET 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov  2 14:08:39 2016 +0100| [2fc667e9d2faed90dfdbbb60d40f09a9e1a51264] | committer: Thomas Guillem

Revert "network: Android has vlc_getaddrinfo_i11e"

This reverts commit 32bd30ca34defa3c7732b98eb26d202e255ae390.

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

 src/Makefile.am           | 3 +--
 src/network/getaddrinfo.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0d211e3..8c247aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -393,8 +393,7 @@ libvlccore_la_SOURCES += \
 	android/thread.c \
 	linux/cpu.c \
 	linux/dirs.c \
-	linux/thread.c \
-	posix/getaddrinfo.c
+	linux/thread.c
 else
 if HAVE_DARWIN
 libvlccore_la_SOURCES += \
diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 952c465..d50c187 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -121,7 +121,7 @@ int vlc_getaddrinfo (const char *node, unsigned port,
 }
 
 #if defined (_WIN32) || defined (__OS2__) \
- || defined (__APPLE__)
+ || defined (__ANDROID__) || defined (__APPLE__)
 #warning vlc_getaddr_info_i11e() not implemented!
 int vlc_getaddrinfo_i11e(const char *node, unsigned port,
                          const struct addrinfo *hints, struct addrinfo **res)



More information about the vlc-commits mailing list