diff --git a/configure.ac b/configure.ac index 14516e576f..f0cab5cca7 100644 --- a/configure.ac +++ b/configure.ac @@ -443,7 +443,6 @@ AM_CONDITIONAL([HAVE_IOS], [test "${HAVE_IOS}" = "1"]) AM_CONDITIONAL([HAVE_OSX], [test "${HAVE_OSX}" = "1"]) AM_CONDITIONAL([HAVE_TVOS], [test "${HAVE_TVOS}" = "1"]) -AM_CONDITIONAL([HAVE_NACL], [test "${SYS}" = "nacl"]) AM_CONDITIONAL([HAVE_LIBANL], [test "${HAVE_LIBANL}" = "1"]) AM_CONDITIONAL([HAVE_WIN32], [test "${SYS}" = "mingw32"]) diff --git a/m4/dolt.m4 b/m4/dolt.m4 index ff28bef516..0daae70ff7 100644 --- a/m4/dolt.m4 +++ b/m4/dolt.m4 @@ -21,7 +21,7 @@ AS_IF([test x$GCC != xyes], [dolt_supported=no]) AS_CASE([$host], [*-*-linux*|*-*-freebsd*], [pic_options='-fPIC'], [*-apple-darwin*], [pic_options='-fno-common'], - [*mingw*|*nacl*], [pic_options=''] + [*mingw*], [pic_options=''] [*], [dolt_supported=no] ) AS_IF([test x$dolt_supported = xno], [ diff --git a/src/Makefile.am b/src/Makefile.am index 6c438122ba..60dffb80b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -433,17 +433,6 @@ libvlccore_la_SOURCES += \ os2/thread.c endif -if HAVE_NACL -libvlccore_la_SOURCES += \ - android/error.c \ - posix/dirs.c \ - posix/filesystem.c \ - posix/netconf.c \ - posix/rand.c \ - posix/specific.c \ - posix/timer.c -endif - if HAVE_EMSCRIPTEN libvlccore_la_SOURCES += \ posix/thread.c \ @@ -490,7 +479,6 @@ endif if !HAVE_WIN32 if !HAVE_OS2 -if !HAVE_NACL libvlccore_la_SOURCES += \ posix/filesystem.c \ posix/plugin.c \ @@ -525,7 +513,6 @@ endif endif endif endif -endif if ENABLE_SOUT libvlccore_la_SOURCES += \ diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c index 14496d5b09..c592b884cc 100644 --- a/src/network/getaddrinfo.c +++ b/src/network/getaddrinfo.c @@ -120,8 +120,7 @@ int vlc_getaddrinfo (const char *node, unsigned port, } #if defined (_WIN32) || defined (__OS2__) \ - || defined (__ANDROID__) || defined (__APPLE__) \ - || defined (__native_client__) + || defined (__ANDROID__) || defined (__APPLE__) #warning vlc_getaddrinfo_i11e() not implemented! int vlc_getaddrinfo_i11e(const char *node, unsigned port, const struct addrinfo *hints, struct addrinfo **res)