diff options
| author | Martin Storsjö <martin@martin.st> | 2010-01-20 17:26:14 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-01-20 17:26:14 +0000 |
| commit | 3d7b42f97b40b398819cbc03944cf4dab16dafad (patch) | |
| tree | c9588a74d33363b5bf583f236cc8b3e3bdbafabc /libavformat | |
| parent | 3b2372bff1237529ec03698f53d2ba06ae8ea00a (diff) | |
| download | ffmpeg-3d7b42f97b40b398819cbc03944cf4dab16dafad.tar.gz | |
Use the configure check from r21351 and use it to properly define struct
sockaddr (in case it's not missing) so it always works on the system that
we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing
a ss_family field). which is used in udp.c. Patch by Martin Storsjö
<$firstname $firstname st>.
Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/network.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index ea8e946701..6e82f81ca8 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -70,7 +70,15 @@ int inet_aton (const char * str, struct in_addr * add); #if !HAVE_STRUCT_SOCKADDR_STORAGE struct sockaddr_storage { - struct sockaddr_in x; +#if HAVE_STRUCT_SOCKADDR_SA_LEN + uint8_t ss_len; + uint8_t ss_family; +#else + uint16_t ss_family; +#endif + char ss_pad1[6]; + int64_t ss_align; + char ss_pad2[112]; }; #endif |