aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2012-06-18 23:36:15 +0300
committerMartin Storsjö <martin@martin.st>2012-07-15 21:41:28 +0300
commitc98e2053f54483525c1098117b7443c522e0ede5 (patch)
tree88993c44bac57a8ac0201079164e3988933e9d10
parent2ca6e9bb47f0f58f0cb4a840b301edf45e77f0e5 (diff)
downloadffmpeg-c98e2053f54483525c1098117b7443c522e0ede5.tar.gz
network: Undefine existing gai_strerror definitions
This avoids warnings if there already exists a definition. This is the case on windows, where the getaddrinfo isn't available and linked to (and we use our fallbacks instead, which actually try to use the proper getaddrinfo version if found at runtime), but gai_strerror still exists as a define. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavformat/network.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/network.h b/libavformat/network.h
index 9b0b94de8b..271f7451d8 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -181,6 +181,7 @@ const char *ff_gai_strerror(int ecode);
#define getaddrinfo ff_getaddrinfo
#define freeaddrinfo ff_freeaddrinfo
#define getnameinfo ff_getnameinfo
+#undef gai_strerror
#define gai_strerror ff_gai_strerror
#endif