diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 01:00:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-16 01:19:53 +0200 |
| commit | b76d6132e385fc4d05b42b03caa82eca3025092e (patch) | |
| tree | d36bc28416669eaaf426460fda6d323312ce0774 /libavformat/network.h | |
| parent | 864d124bb7aa533764f5e4b6063e1615d6815d02 (diff) | |
| download | ffmpeg-b76d6132e385fc4d05b42b03caa82eca3025092e.tar.gz | |
avformat/network: move sockaddr_union after sockaddr_storage compatibility code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index d4e1a894cb..0d1081ad1f 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -72,14 +72,6 @@ int ff_neterrno(void); #include <poll.h> #endif -typedef union sockaddr_union { - struct sockaddr_storage storage; - struct sockaddr_in in; -#if HAVE_STRUCT_SOCKADDR_IN6 - struct sockaddr_in6 in6; -#endif -} sockaddr_union; - int ff_socket_nonblock(int socket, int enable); extern int ff_network_inited_globally; @@ -119,6 +111,14 @@ struct sockaddr_storage { }; #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */ +typedef union sockaddr_union { + struct sockaddr_storage storage; + struct sockaddr_in in; +#if HAVE_STRUCT_SOCKADDR_IN6 + struct sockaddr_in6 in6; +#endif +} sockaddr_union; + #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 #endif |