From f0d8ac529ff4373a8b8565cfacfa380edd2f16bc Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 3 Sep 2010 20:06:01 +0000 Subject: [PATCH] Move INET6_ADDRSTRLEN to network.h, similar to other network-related fixups for broken OSes. This is included in rtsp.h, as opposed to os_support.h. Should fix OS/2 broken build on fate. Originally committed as revision 25035 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/network.h | 4 ++++ libavformat/os_support.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/network.h b/libavformat/network.h index 0fbcbbb227..d1f3d29455 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -151,4 +151,8 @@ const char *ff_gai_strerror(int ecode); #define gai_strerror ff_gai_strerror #endif +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN INET_ADDRSTRLEN +#endif + #endif /* AVFORMAT_NETWORK_H */ diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 1330d3dc04..5c9e81b340 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -55,10 +55,6 @@ typedef int socklen_t; #define closesocket close #endif -#ifndef INET6_ADDRSTRLEN -#define INET6_ADDRSTRLEN INET_ADDRSTRLEN -#endif - #if CONFIG_FFSERVER #if !HAVE_POLL_H typedef unsigned long nfds_t;