Changeset 6079 for pjproject

Timestamp:

Sep 26, 2019 11:15:24 AM (5 years ago)

Author:

nanang

Message:

Misc (re #2210): Fixed compile errors on MinGW.

Location:

pjproject/trunk/pjlib/src/pj

Files:

• ip_helper_generic.c (modified) (3 diffs)
• ssl_sock_ossl.c (modified) (1 diff)

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

@@ -537 +537 @@
         unsigned deprecatedCount = *p_cnt;
         unsigned cnt = 0;
+        int i;
         pj_status_t status;
 
@@ -547 +548 @@
             return status;
 
-        for (int i = 0; i < *p_cnt; ++i) {
+        for (i = 0; i < *p_cnt; ++i) {
+            int j;
+            
             ifs[cnt++] = addrs[i];
 
@@ -553 +556 @@
                 continue;
 
-            for (int j = 0; j < deprecatedCount; ++j) {
+            for (j = 0; j < deprecatedCount; ++j) {
                 if (pj_sockaddr_cmp(&addrs[i], &deprecatedAddrs[j]) == 0) {
                     cnt--;

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

@@ -146 +146 @@
 #    pragma comment(lib, "ssleay32")
 #  endif
-#  define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
+#endif
+
+
+#if defined(PJ_WIN32) && PJ_WIN32 != 0 || \
+    defined(PJ_WIN64) && PJ_WIN64 != 0
+#  ifdef _MSC_VER
+#    define strerror_r(err,buf,len) strerror_s(buf,len,err)
+#  else
+#    define strerror_r(err,buf,len) pj_ansi_strncpy(buf,strerror(err),len)
+#  endif
 #endif