Changeset 5635 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Aug 1, 2017 7:49:34 AM (7 years ago)

Author:

nanang

Message:

Misc (re #1994): Fixed compile warnings on MSVC 2005 & 2015.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (2 diffs)

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

@@ -116 +116 @@
 #  define M_ASN1_STRING_data(x)     ASN1_STRING_get0_data(x)
 #  define M_ASN1_STRING_length(x)   ASN1_STRING_length(x)
-#  define X509_get_notBefore(x)     X509_get0_notBefore(x)
-#  define X509_get_notAfter(x)      X509_get0_notAfter(x)
+#  if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L
+#     define X509_get_notBefore(x)  X509_get0_notBefore(x)
+#     define X509_get_notAfter(x)   X509_get0_notAfter(x)
+#  endif
 #else
 #  define SSL_CIPHER_get_id(c)      (c)->id
@@ -133 +135 @@
 #    pragma comment(lib, "ssleay32")
 #  endif
+#  define strerror_r(errno,buf,len) strerror_s(buf,len,errno)
 #endif