Changeset 1269 for pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

Timestamp:

May 12, 2007 3:03:23 PM (17 years ago)

Author:

bennylp

Message:

Symbian fixes to compile on GCCE (nested callbacks etc)

File:

• pjproject/trunk/pjlib/src/pj/sock_symbian.cpp (modified) (6 diffs)

pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

@@ -272 +272 @@
     temp_addr.Output(str16);
  
-    return pj_unicode_to_ansi(str16.PtrZ(), str16.Length(),
+    return pj_unicode_to_ansi((const wchar_t*)str16.PtrZ(), str16.Length(),
                               str8, sizeof(str8));
 }
@@ -308 +308 @@
                        tempaddr16, sizeof(tempaddr16));
 
-    TBuf<MAXIPLEN> ip_addr(tempaddr16);
+    TBuf<MAXIPLEN> ip_addr((const TText*)tempaddr16);
 
     TInetAddr addr;
@@ -419 +419 @@
         User::WaitForRequest(reqStatus);
 
-        hostname.ptr = pj_unicode_to_ansi(tmpName.Ptr(), tmpName.Length(),
+        hostname.ptr = pj_unicode_to_ansi((const wchar_t*)tmpName.Ptr(), tmpName.Length(),
                                           buf, sizeof(buf));
         hostname.slen = tmpName.Length();
@@ -552 +552 @@
     
     PJ_ASSERT_RETURN(sock && addr && namelen && 
-                     *namelen>=sizeof(pj_sockaddr_in), PJ_EINVAL);
+                     *namelen>=(int)sizeof(pj_sockaddr_in), PJ_EINVAL);
 
     CPjSocket *pjSock = (CPjSocket*)sock;
@@ -579 +579 @@
     
     PJ_ASSERT_RETURN(sock && addr && namelen && 
-                     *namelen>=sizeof(pj_sockaddr_in), PJ_EINVAL);
+                     *namelen>=(int)sizeof(pj_sockaddr_in), PJ_EINVAL);
 
     CPjSocket *pjSock = (CPjSocket*)sock;
@@ -729 +729 @@
     PJ_ASSERT_RETURN(sock && buf && len && from && fromlen, PJ_EINVAL);
     PJ_ASSERT_RETURN(*len > 0, PJ_EINVAL);
-    PJ_ASSERT_RETURN(*fromlen >= sizeof(pj_sockaddr_in), PJ_EINVAL);
+    PJ_ASSERT_RETURN(*fromlen >= (int)sizeof(pj_sockaddr_in), PJ_EINVAL);
 
     CPjSocket *pjSock = (CPjSocket*)sock;