Changeset 3002

Timestamp:

Nov 10, 2009 4:30:46 AM (15 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/trunk/pjlib

Files:

• include/pj/compat/os_win32.h (modified) (1 diff)
• src/pj/ip_helper_win32.c (modified) (5 diffs)

pjproject/trunk/pjlib/include/pj/compat/os_win32.h

@@ -112 +112 @@
 #   define PJ_OS_HAS_CHECK_STACK        1
 #endif
-#define PJ_NATIVE_STRING_IS_UNICODE     0
+
+#ifdef UNICODE
+#   define PJ_NATIVE_STRING_IS_UNICODE    1
+#else
+#   define PJ_NATIVE_STRING_IS_UNICODE    0
+#endif
 
 #define PJ_ATOMIC_VALUE_TYPE            long

pjproject/trunk/pjlib/src/pj/ip_helper_win32.c

@@ -78 +78 @@
 }
 
-static FARPROC GetIpHlpApiProc(pj_char_t *lpProcName)
+static FARPROC GetIpHlpApiProc(char *lpProcName)
 {
     if(NULL == s_hDLL) {
@@ -99 +99 @@
     if(NULL == s_pfnGetIpAddrTable) {
         s_pfnGetIpAddrTable = (PFN_GetIpAddrTable) 
-            GetIpHlpApiProc(PJ_T("GetIpAddrTable"));
+            GetIpHlpApiProc("GetIpAddrTable");
     }
     
@@ -118 +118 @@
     if(NULL == s_pfnGetAdapterAddresses) {
         s_pfnGetAdapterAddresses = (PFN_GetAdapterAddresses) 
-            GetIpHlpApiProc(PJ_T("GetAdapterAddresses"));
+            GetIpHlpApiProc("GetAdapterAddresses");
     }
     
@@ -135 +135 @@
     if(NULL == s_pfnGetIfEntry) {
         s_pfnGetIfEntry = (PFN_GetIfEntry) 
-            GetIpHlpApiProc(PJ_T("GetIfEntry"));
+            GetIpHlpApiProc("GetIfEntry");
     }
     
@@ -153 +153 @@
     if(NULL == s_pfnGetIpForwardTable) {
         s_pfnGetIpForwardTable = (PFN_GetIpForwardTable) 
-            GetIpHlpApiProc(PJ_T("GetIpForwardTable"));
+            GetIpHlpApiProc("GetIpForwardTable");
     }