diff options
| author | Martin Storsjö <martin@martin.st> | 2012-06-25 12:50:13 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-07-15 21:41:38 +0300 |
| commit | 9e4b04f8b9bce79adeb6f7784619a93d5682d509 (patch) | |
| tree | 5a06bf539b149d77072ef5b7691460c7f169e4bb /libavformat/os_support.c | |
| parent | c98e2053f54483525c1098117b7443c522e0ede5 (diff) | |
network: Always use our version of gai_strerror on windows
Even if linking directly to getaddrinfo, use our version of
gai_strerror instead of the system's version. Microsoft explicitly
documents that their version of gai_strerror is thread-unsafe.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/os_support.c')
| -rw-r--r-- | libavformat/os_support.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/os_support.c b/libavformat/os_support.c index 76204e0546..9992a631c5 100644 --- a/libavformat/os_support.c +++ b/libavformat/os_support.c @@ -239,7 +239,9 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen, return 0; } +#endif /* !HAVE_GETADDRINFO */ +#if !HAVE_GETADDRINFO || HAVE_WINSOCK2_H const char *ff_gai_strerror(int ecode) { switch(ecode) { @@ -258,7 +260,7 @@ const char *ff_gai_strerror(int ecode) return "Unknown error"; } -#endif +#endif /* !HAVE_GETADDRINFO || HAVE_WINSOCK2_H */ int ff_socket_nonblock(int socket, int enable) { |