RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  network.h: Add #endif comments to improve readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-07 13:16:47 +01:00
parent 99b6357f37 9997cee04d
commit 77274d5c79
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/network.h
View File

@ -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