Changeset 5513 for pjproject/branches/projects/uwp/pjlib/include/pj/compat/os_auto.h.in

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjlib/include/pj/compat/os_auto.h.in (modified) (5 diffs)

pjproject/branches/projects/uwp/pjlib/include/pj/compat/os_auto.h.in

@@ -84 +84 @@
 #undef PJ_HAS_WS2TCPIP_H
 
+#undef PJ_SOCK_HAS_IPV6_V6ONLY
 #undef PJ_SOCK_HAS_INET_ATON
 #undef PJ_SOCK_HAS_INET_PTON
@@ -129 +130 @@
 #undef PJ_SELECT_NEEDS_NFDS
 
+/* Was Linux epoll support enabled */
+#undef PJ_HAS_LINUX_EPOLL
+
 /* Is errno a good way to retrieve OS errors?
  */
@@ -163 +167 @@
 #endif
 
+/* Is localtime_r() available? */
+#undef PJ_HAS_LOCALTIME_R
+
 /* Unicode? */
 #undef PJ_NATIVE_STRING_IS_UNICODE
@@ -173 +180 @@
 
 #if defined(PJ_DARWINOS) && PJ_DARWINOS!=0
+     /* Disable local host resolution in pj_gethostip() (see ticket #1342) */
+#    define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
+     /* Use pj_getaddrinfo() (instead of pj_inet_pton()) in
+      * pj_sockaddr_set_str_addr()
+      */
+#    define PJ_SOCKADDR_USE_GETADDRINFO 1
+
 #    include "TargetConditionals.h"
 #    if TARGET_OS_IPHONE
@@ -178 +192 @@
         /* Use CFHost API for pj_getaddrinfo() (see ticket #1246) */
 #       define PJ_GETADDRINFO_USE_CFHOST 1
-        /* Disable local host resolution in pj_gethostip() (see ticket #1342) */
-#       define PJ_GETHOSTIP_DISABLE_LOCAL_RESOLUTION 1
 #       ifdef __IPHONE_4_0
             /* Is multitasking support available?  (see ticket #1107) */