Merge remote-tracking branch 'origin/master' into oboe

# Conflicts:
#	src/CMakeLists.txt

src/CMakeLists.txt

@@ -62,6 +62,7 @@ set (USE_EVS_CODEC       OFF CACHE BOOL "Use EVS codec."                    )
 set (USE_OPUS_CODEC      OFF CACHE BOOL "Use Opus codec."                   )
 set (USE_PVQA_LIB        OFF CACHE BOOL "Build with Sevana PVQA library"    )
 set (USE_AQUA_LIB        OFF CACHE BOOL "Build with Sevana AQuA library"    )
+set (USE_MUSL            OFF CACHE BOOL "Build with MUSL library"           )
 
 # PIC code by default
 set (CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -82,10 +83,12 @@ if (CMAKE_SYSTEM MATCHES "Linux*")
     add_definitions (-DTARGET_LINUX)
 endif()
 
+
 if (CMAKE_SYSTEM MATCHES "Darwin*")
     add_definitions (-DTARGET_OSX)
 endif()
 
+<<<<<<< ours
 if (CMAKE_SYSTEM MATCHES "Android")
     message("Adding the Oboe library")
     set (OBOE_DIR libs/oboe)
@@ -93,6 +96,13 @@ if (CMAKE_SYSTEM MATCHES "Android")
     include_directories (${OBOE_DIR}/include)
 endif()
 
+=======
+if (USE_MUSL)
+    add_definitions(-DTARGET_MUSL)
+endif()
+
+
+>>>>>>> theirs
 if (USE_AQUA_LIB)
     message("Use AQuA library")
     add_definitions( -DUSE_AQUA_LIBRARY )

src/libs/ice/CMakeLists.txt

@@ -34,6 +34,10 @@ set (ICE_STACK_SOURCES ICEAddress.cpp
     ICETime.cpp
     ICETransactionList.cpp)
 
+if (TARGET_MUSL)
+    add_definitions(-DTARGET_MUSL)
+endif()
+
 add_definitions(-DUSE_NATIVE_SMARTPTR -D_WINSOCK_DEPRECATED_NO_WARNINGS)
 
 add_library(ice_stack ${ICE_STACK_SOURCES})

src/libs/ice/ICEAddress.cpp

@@ -24,6 +24,7 @@
 # include <ws2tcpip.h>
 #else
 # include <netinet/in.h>
+
 # if /*defined(TARGET_LINUX) || */ defined(TARGET_ANDROID)
 #  include <linux/in6.h>
 # endif
@@ -464,15 +465,15 @@ unsigned char* NetworkAddress::ipBytes() const
 #endif
   case AF_INET6:
 #ifdef TARGET_WIN
-    return (unsigned char*)mAddr6.sin6_addr.u.Byte;
+    return (unsigned char*)mAddr6.sin6_addr.u.Byte;
-#elif defined(TARGET_OSX) || defined(TARGET_IOS)
+#elif defined(TARGET_OSX) || defined(TARGET_IOS)
-    return (unsigned char*)&mAddr6.sin6_addr.__u6_addr.__u6_addr8;
+    return (unsigned char*)&mAddr6.sin6_addr.__u6_addr.__u6_addr8;
-#elif defined(TARGET_OPENWRT)
+#elif defined(TARGET_OPENWRT) || defined(TARGET_MUSL)
-    return (unsigned char*)&mAddr6.sin6_addr.__in6_union.__s6_addr;
+    return (unsigned char*)&mAddr6.sin6_addr.__in6_union.__s6_addr;
-#elif defined(TARGET_LINUX)
+#elif defined(TARGET_LINUX)
-    return (unsigned char*)&mAddr6.sin6_addr.__in6_u.__u6_addr8;
+    return (unsigned char*)&mAddr6.sin6_addr.__in6_u.__u6_addr8;
-#elif defined(TARGET_ANDROID)
+#elif defined(TARGET_ANDROID)
-    return (unsigned char*)&mAddr6.sin6_addr.in6_u.u6_addr8;
+    return (unsigned char*)&mAddr6.sin6_addr.in6_u.u6_addr8;
 #endif
   }
   assert(0);

src/libs/ice/ICENetworkHelper.cpp

@@ -434,40 +434,40 @@ bool NetworkHelper::hasIPv6() const
     if (item.family() == AF_INET6 && (item.isLAN() || item.isPublic()))
       return true;
   return false;
-}
+}
-
+
-void NetworkHelper::NetworkToHost(const in6_addr& addr6, uint32_t* output)
+void NetworkHelper::NetworkToHost(const in6_addr& addr6, uint32_t* output)
-{
+{
-  for (int i=0; i<4; i++)
+  for (int i=0; i<4; i++)
-#if defined(TARGET_WIN)
+#if defined(TARGET_WIN)
-    output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]);
+    output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]);
-#elif defined(TARGET_IOS) || defined(TARGET_OSX)
+#elif defined(TARGET_IOS) || defined(TARGET_OSX)
-    output[i] = ntohl(addr6.__u6_addr.__u6_addr32[i]);
+    output[i] = ntohl(addr6.__u6_addr.__u6_addr32[i]);
-#elif defined(TARGET_OPENWRT)
+#elif defined(TARGET_OPENWRT) || defined(TARGET_MUSL)
-      output[i] = ntohl(addr6.__in6_union.__s6_addr32[i]);
+      output[i] = ntohl(addr6.__in6_union.__s6_addr32[i]);
-#elif defined(TARGET_LINUX)
+#elif defined(TARGET_LINUX)
-    output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]);
+    output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]);
-#elif defined(TARGET_ANDROID)
+#elif defined(TARGET_ANDROID)
-    output[i] = ntohl(addr6.in6_u.u6_addr32[i]);
+    output[i] = ntohl(addr6.in6_u.u6_addr32[i]);
-#endif
+#endif
-}
+}
-
+
-void NetworkHelper::HostToNetwork(const uint32_t* input, in6_addr& output)
+void NetworkHelper::HostToNetwork(const uint32_t* input, in6_addr& output)
-{
+{
-  for (int i=0; i<4; i++)
+  for (int i=0; i<4; i++)
-#if defined(TARGET_WIN)
+#if defined(TARGET_WIN)
-    ((uint32_t*)&output.u.Byte[0])[i] = htonl(input[i]);
+    ((uint32_t*)&output.u.Byte[0])[i] = htonl(input[i]);
-#elif defined(TARGET_OSX) || defined(TARGET_IOS)
+#elif defined(TARGET_OSX) || defined(TARGET_IOS)
-    output.__u6_addr.__u6_addr32[i] = htonl(input[i]);
+    output.__u6_addr.__u6_addr32[i] = htonl(input[i]);
-#elif defined(TARGET_OPENWRT)
+#elif defined(TARGET_OPENWRT) || defined(TARGET_MUSL)
-      output.__in6_union.__s6_addr32[i] = htonl(input[i]);
+      output.__in6_union.__s6_addr32[i] = htonl(input[i]);
-#elif defined(TARGET_LINUX)
+#elif defined(TARGET_LINUX)
-    output.__in6_u.__u6_addr32[i] = htonl(input[i]);
+    output.__in6_u.__u6_addr32[i] = htonl(input[i]);
-#elif defined(TARGET_ANDROID)
+#elif defined(TARGET_ANDROID)
-    output.in6_u.u6_addr32[i] = htonl(input[i]);
+    output.in6_u.u6_addr32[i] = htonl(input[i]);
-#endif
+#endif
-}
+}
-
+
 NetworkHelper* NetworkHelper::mInstance = NULL;
 Mutex NetworkHelper::mGuard;
 

src/libs/resiprocate/rutil/RecursiveMutex.cxx

@@ -70,7 +70,11 @@ RecursiveMutex::RecursiveMutex()
 #ifndef WIN32
    int rc = pthread_mutexattr_init(&mMutexAttr);
  #if defined(__linux__)
+ #if defined(PTHREAD_MUTEX_RECURSIVE_NP)
    pthread_mutexattr_settype(&mMutexAttr, PTHREAD_MUTEX_RECURSIVE_NP);
+ #else
+   pthread_mutexattr_settype(&mMutexAttr, PTHREAD_MUTEX_RECURSIVE);
+ #endif
  #else
    pthread_mutexattr_settype(&mMutexAttr, PTHREAD_MUTEX_RECURSIVE);
  #endif