X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnetwork.h;h=5ca906491ac193d4fa4e00da3bacbe7247c8eab0;hb=12bc33d7cd04d863466d4a2d18a7fbcb59372429;hp=c60e1424a1cd8c5a70d6dc2a35377ec28c4e802b;hpb=3cf1503beb35203ef4b9ddef5a2bc8b6f919eb12;p=ffmpeg diff --git a/libavformat/network.h b/libavformat/network.h index c60e1424a1c..5ca906491ac 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -62,7 +62,7 @@ int ff_neterrno(void); #include #define ff_neterrno() AVERROR(errno) -#endif +#endif /* HAVE_WINSOCK2_H */ #if HAVE_ARPA_INET_H #include @@ -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