Merge pull request #2759 from NWilson/incoming

fix linker warning and a small bit of uninitialised memory

Author: juj

AUTHORS

@@ -158,4 +158,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Коренберг Марк <[email protected]>
 * Gauthier Billot <[email protected]>
 * Árpád Goretity <[email protected]>
+* Nicholas Wilson <[email protected]>
 

cmake/Modules/Platform/Emscripten.cmake

@@ -149,6 +149,7 @@ set(CMAKE_HAVE_UNISTD_H 1)
 set(CMAKE_HAVE_PTHREAD_H 1)
 set(CMAKE_HAVE_SYS_PRCTL_H 1)
 set(CMAKE_WORDS_BIGENDIAN 0)
+set(CMAKE_DL_LIBS)
 
 set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_RELEASE")
 set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os" CACHE STRING "Emscripten-overridden CMAKE_C_FLAGS_MINSIZEREL")

src/library.js

@@ -7871,6 +7871,8 @@ LibraryManager.library = {
         {{{ makeSetValue('sa', C_STRUCTS.sockaddr_in6.sin6_addr.__in6_union.__s6_addr+8, 'addr[2]', 'i32') }}};
         {{{ makeSetValue('sa', C_STRUCTS.sockaddr_in6.sin6_addr.__in6_union.__s6_addr+12, 'addr[3]', 'i32') }}};
         {{{ makeSetValue('sa', C_STRUCTS.sockaddr_in6.sin6_port, '_htons(port)', 'i16') }}};
+        {{{ makeSetValue('sa', C_STRUCTS.sockaddr_in6.sin6_flowinfo, '0', 'i32') }}};
+        {{{ makeSetValue('sa', C_STRUCTS.sockaddr_in6.sin6_scope_id, '0', 'i32') }}};
         break;
       default:
         return { errno: ERRNO_CODES.EAFNOSUPPORT };