Changeset 6010

Timestamp:

May 28, 2019 4:11:37 AM (4 years ago)

Author:

nanang

Message:

Misc (re #2147): Fixed various build warnings (when building for Android).

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/turn_sock.c (modified) (4 diffs)
• third_party/srtp/crypto/hash/hmac_ossl.c (modified) (1 diff)

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -717 +717 @@
 }
 
+#if PJ_HAS_SSL_SOCK
 static pj_bool_t on_connect_complete_ssl_sock(pj_ssl_sock_t *ssl_sock,
                                               pj_status_t status)
@@ -728 +729 @@
     return on_connect_complete(turn_sock, status);
 }
+#endif
 
 static pj_uint16_t GETVAL16H(const pj_uint8_t *buf, unsigned pos)
@@ -857 +859 @@
 }
 
+#if PJ_HAS_SSL_SOCK
 static pj_bool_t on_data_read_ssl_sock(pj_ssl_sock_t *ssl_sock,
                                        void *data,
@@ -894 +897 @@
     return PJ_TRUE;
 }
+#endif
 
 /*

pjproject/trunk/third_party/srtp/crypto/hash/hmac_ossl.c

@@ -55 +55 @@
 
 #define SHA1_DIGEST_SIZE                20
-#define USING_LIBRESSL (defined(LIBRESSL_VERSION_NUMBER))
+
+#if defined(LIBRESSL_VERSION_NUMBER)
+#       define USING_LIBRESSL 1
+#else
+#       define USING_LIBRESSL 0
+#endif
 
 /* the debug module for authentiation */