Bug 1520646: Fix some NSPR build issues that show up in a unified build, r=kaie
authorDavid Major <dmajor@mozilla.com>
Thu, 07 Feb 2019 20:21:51 +0100
changeset 4799 494198b1bad6
parent 4798 56bef12b6f9a
child 4800 5f4fed68d661
push id306
push userkaie@kuix.de
push dateThu, 07 Feb 2019 19:22:12 +0000
reviewerskaie
bugs1520646
Bug 1520646: Fix some NSPR build issues that show up in a unified build, r=kaie
pr/include/md/_win32_errors.h
pr/src/io/pripv6.c
--- a/pr/include/md/_win32_errors.h
+++ b/pr/include/md/_win32_errors.h
@@ -78,17 +78,17 @@ extern void _MD_win32_map_sendto_error(P
 #define	_PR_MD_MAP_SENDTO_ERROR	_MD_win32_map_sendto_error
 
 extern void _MD_win32_map_accept_error(PRInt32 err);
 #define	_PR_MD_MAP_ACCEPT_ERROR	_MD_win32_map_accept_error
 
 extern void _MD_win32_map_acceptex_error(PRInt32 err);
 #define	_PR_MD_MAP_ACCEPTEX_ERROR	_MD_win32_map_acceptex_error
 
-extern PRInt32 _MD_win32_map_connect_error(PRInt32 err);
+extern void _MD_win32_map_connect_error(PRInt32 err);
 #define	_PR_MD_MAP_CONNECT_ERROR	_MD_win32_map_connect_error
 
 extern void _MD_win32_map_bind_error(PRInt32 err);
 #define	_PR_MD_MAP_BIND_ERROR	_MD_win32_map_bind_error
 
 extern void _MD_win32_map_listen_error(PRInt32 err);
 #define	_PR_MD_MAP_LISTEN_ERROR	_MD_win32_map_listen_error
 
--- a/pr/src/io/pripv6.c
+++ b/pr/src/io/pripv6.c
@@ -242,17 +242,17 @@ static PRInt32 PR_CALLBACK Ipv6ToIpv4Soc
 		_PR_ConvertToIpv6NetAddr(&tmp_ipv4addr, ipv6addr);
 		PR_ASSERT(IsValidNetAddr(ipv6addr) == PR_TRUE);
 	}
 	return result;
 }
 
 #if defined(_PR_INET6_PROBE)
 static PRBool ipv6_is_present;
-extern PRBool _pr_test_ipv6_socket(void);
+PR_EXTERN(PRBool) _pr_test_ipv6_socket(void);
 
 #if !defined(_PR_INET6) && defined(_PR_HAVE_GETIPNODEBYNAME)
 extern PRStatus _pr_find_getipnodebyname(void);
 #endif
 
 #if !defined(_PR_INET6) && defined(_PR_HAVE_GETADDRINFO)
 extern PRStatus _pr_find_getaddrinfo(void);
 #endif