diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 13:16:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-07 13:16:55 +0100 |
| commit | 77274d5c79a1cf74f1bd9773c1beda554dc90cb2 (patch) | |
| tree | 9c3c42645e0b13c7fcde54e2a5bacfd670443318 /libavformat/network.h | |
| parent | 99b6357f37b733cc2b6a7604efaaa5803be04017 (diff) | |
| parent | 9997cee04d6adfa301e2495428c4d664fa4ad0ad (diff) | |
| download | ffmpeg-77274d5c79a1cf74f1bd9773c1beda554dc90cb2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
network.h: Add #endif comments to improve readability
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index c60e1424a1..5ca906491a 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -62,7 +62,7 @@ int ff_neterrno(void); #include <netdb.h> #define ff_neterrno() AVERROR(errno) -#endif +#endif /* HAVE_WINSOCK2_H */ #if HAVE_ARPA_INET_H #include <arpa/inet.h> @@ -104,12 +104,12 @@ struct sockaddr_storage { uint8_t ss_family; #else uint16_t ss_family; -#endif +#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */ char ss_pad1[6]; int64_t ss_align; char ss_pad2[112]; }; -#endif +#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */ #if !HAVE_STRUCT_ADDRINFO struct addrinfo { @@ -122,7 +122,7 @@ struct addrinfo { char *ai_canonname; struct addrinfo *ai_next; }; -#endif +#endif /* !HAVE_STRUCT_ADDRINFO */ /* getaddrinfo constants */ #ifndef EAI_AGAIN @@ -195,12 +195,13 @@ int ff_getnameinfo(const struct sockaddr *sa, int salen, #define getaddrinfo ff_getaddrinfo #define freeaddrinfo ff_freeaddrinfo #define getnameinfo ff_getnameinfo -#endif +#endif /* !HAVE_GETADDRINFO */ + #if !HAVE_GETADDRINFO || HAVE_WINSOCK2_H const char *ff_gai_strerror(int ecode); #undef gai_strerror #define gai_strerror ff_gai_strerror -#endif +#endif /* !HAVE_GETADDRINFO || HAVE_WINSOCK2_H */ #ifndef INADDR_LOOPBACK #define INADDR_LOOPBACK 0x7f000001 |