Changeset 3002


Ignore:
Timestamp:
Nov 10, 2009 4:30:46 AM (9 years ago)
Author:
bennylp
Message:

Fixed ticket #989: Issues with Windows Unicode build (thanks Michele Cicciotti for the patch)

Location:
pjproject/trunk/pjlib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/include/pj/compat/os_win32.h

    r2962 r3002  
    112112#   define PJ_OS_HAS_CHECK_STACK        1 
    113113#endif 
    114 #define PJ_NATIVE_STRING_IS_UNICODE     0 
     114 
     115#ifdef UNICODE 
     116#   define PJ_NATIVE_STRING_IS_UNICODE    1 
     117#else 
     118#   define PJ_NATIVE_STRING_IS_UNICODE    0 
     119#endif 
    115120 
    116121#define PJ_ATOMIC_VALUE_TYPE            long 
  • pjproject/trunk/pjlib/src/pj/ip_helper_win32.c

    r2394 r3002  
    7878} 
    7979 
    80 static FARPROC GetIpHlpApiProc(pj_char_t *lpProcName) 
     80static FARPROC GetIpHlpApiProc(char *lpProcName) 
    8181{ 
    8282    if(NULL == s_hDLL) { 
     
    9999    if(NULL == s_pfnGetIpAddrTable) { 
    100100        s_pfnGetIpAddrTable = (PFN_GetIpAddrTable)  
    101             GetIpHlpApiProc(PJ_T("GetIpAddrTable")); 
     101            GetIpHlpApiProc("GetIpAddrTable"); 
    102102    } 
    103103     
     
    118118    if(NULL == s_pfnGetAdapterAddresses) { 
    119119        s_pfnGetAdapterAddresses = (PFN_GetAdapterAddresses)  
    120             GetIpHlpApiProc(PJ_T("GetAdapterAddresses")); 
     120            GetIpHlpApiProc("GetAdapterAddresses"); 
    121121    } 
    122122     
     
    135135    if(NULL == s_pfnGetIfEntry) { 
    136136        s_pfnGetIfEntry = (PFN_GetIfEntry)  
    137             GetIpHlpApiProc(PJ_T("GetIfEntry")); 
     137            GetIpHlpApiProc("GetIfEntry"); 
    138138    } 
    139139     
     
    153153    if(NULL == s_pfnGetIpForwardTable) { 
    154154        s_pfnGetIpForwardTable = (PFN_GetIpForwardTable)  
    155             GetIpHlpApiProc(PJ_T("GetIpForwardTable")); 
     155            GetIpHlpApiProc("GetIpForwardTable"); 
    156156    } 
    157157     
Note: See TracChangeset for help on using the changeset viewer.