generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/network: move sockaddr_union after sockaddr_storage compatibility code

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-16 01:00:49 +02:00
parent 864d124bb7
commit b76d6132e3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/network.h
View File

@ -72,14 +72,6 @@ int ff_neterrno(void);
#include <poll.h> #include <poll.h>
#endif #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); int ff_socket_nonblock(int socket, int enable);
extern int ff_network_inited_globally; extern int ff_network_inited_globally;
@ -119,6 +111,14 @@ struct sockaddr_storage {
}; };
#endif /* !HAVE_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 #ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0 #define MSG_NOSIGNAL 0
#endif #endif