diff options
| author | David Major <dmajor@mozilla.com> | 2019-02-07 20:21:51 +0100 |
|---|---|---|
| committer | David Major <dmajor@mozilla.com> | 2019-02-07 20:21:51 +0100 |
| commit | 84381ac4d1abe1a291b4cad7844367cd1f5d80cd (patch) | |
| tree | e3d41fbc336289a0db1558e44970779e9e3bb6a7 | |
| parent | de6b043b9b93cf485260b14ae0086b6c71858469 (diff) | |
| download | nspr-hg-84381ac4d1abe1a291b4cad7844367cd1f5d80cd.tar.gz | |
Bug 1520646: Fix some NSPR build issues that show up in a unified build, r=kaie
| -rw-r--r-- | pr/include/md/_win32_errors.h | 2 | ||||
| -rw-r--r-- | pr/src/io/pripv6.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pr/include/md/_win32_errors.h b/pr/include/md/_win32_errors.h index 1c962372..173f6b39 100644 --- a/pr/include/md/_win32_errors.h +++ b/pr/include/md/_win32_errors.h @@ -83,7 +83,7 @@ extern void _MD_win32_map_accept_error(PRInt32 err); 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); diff --git a/pr/src/io/pripv6.c b/pr/src/io/pripv6.c index af7de49d..cdd1ce54 100644 --- a/pr/src/io/pripv6.c +++ b/pr/src/io/pripv6.c @@ -247,7 +247,7 @@ static PRInt32 PR_CALLBACK Ipv6ToIpv4SocketRecvFrom(PRFileDesc *fd, void *buf, #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); |