[FFmpeg-cvslog] network: Undefine existing gai_strerror definitions

Martin Storsjö git at videolan.org
Mon Jul 16 20:51:09 CEST 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Jun 18 23:36:15 2012 +0300| [c98e2053f54483525c1098117b7443c522e0ede5] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c98e2053f54483525c1098117b7443c522e0ede5
---

 libavformat/network.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/network.h b/libavformat/network.h
index 9b0b94d..271f745 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
 



More information about the ffmpeg-cvslog mailing list