Changeset 5319


Ignore:
Timestamp:
May 25, 2016 8:38:49 AM (3 years ago)
Author:
nanang
Message:

Fix #1925: pj_getaddrinfo() should invoke getaddrinfo() even when IP address is inputted, except on Windows Mobile platforms (see #458).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/addr_resolv_sock.c

    r5295 r5319  
    8383                     af==PJ_AF_UNSPEC, PJ_EINVAL); 
    8484 
     85#if PJ_WIN32_WINCE 
     86 
    8587    /* Check if nodename is IP address */ 
    8688    pj_bzero(&ai[0], sizeof(ai[0])); 
     
    109111        return PJ_SUCCESS; 
    110112    } 
     113 
     114#else /* PJ_WIN32_WINCE */ 
     115    PJ_UNUSED_ARG(has_addr); 
     116#endif 
    111117 
    112118    /* Copy node name to null terminated string. */ 
     
    214220    PJ_ASSERT_RETURN(count && *count, PJ_EINVAL); 
    215221 
     222#if PJ_WIN32_WINCE 
     223 
    216224    /* Check if nodename is IP address */ 
    217225    pj_bzero(&ai[0], sizeof(ai[0])); 
     
    241249        return PJ_SUCCESS; 
    242250    } 
     251 
     252#else /* PJ_WIN32_WINCE */ 
     253    PJ_UNUSED_ARG(has_addr); 
     254#endif 
    243255 
    244256    if (af == PJ_AF_INET || af == PJ_AF_UNSPEC) { 
Note: See TracChangeset for help on using the changeset viewer.