vlc | branch: master | KO Myung-Hun <[email protected]> | Tue Mar 28 22:08:48 2017 +0900| [f72f52e2ab3f41a5d2fb6eec37ab1414f7b41afe] | committer: Jean-Baptiste Kempf
vlc_network: move OS/2 stuffs to include/vlc_fixups.h Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f72f52e2ab3f41a5d2fb6eec37ab1414f7b41afe --- include/vlc_fixups.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/vlc_network.h | 50 -------------------------------------------------- 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h index c9d9d7b..23bf2ec 100644 --- a/include/vlc_fixups.h +++ b/include/vlc_fixups.h @@ -474,6 +474,10 @@ long nrand48 (unsigned short subi[3]); #ifdef __OS2__ # undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */ +# define SHUT_RD 0 +# define SHUT_WR 1 +# define SHUT_RDWR 2 + /* GAI error codes */ # ifndef EAI_BADFLAGS # define EAI_BADFLAGS -1 @@ -512,11 +516,23 @@ long nrand48 (unsigned short subi[3]); # define EAI_SYSTEM -12 # endif +# ifndef NI_NUMERICHOST +# define NI_NUMERICHOST 0x01 +# define NI_NUMERICSERV 0x02 +# define NI_NOFQDN 0x04 +# define NI_NAMEREQD 0x08 +# define NI_DGRAM 0x10 +# endif + # ifndef NI_MAXHOST # define NI_MAXHOST 1025 # define NI_MAXSERV 32 # endif +# define AI_PASSIVE 1 +# define AI_CANONNAME 2 +# define AI_NUMERICHOST 4 + struct addrinfo { int ai_flags; @@ -529,7 +545,37 @@ struct addrinfo struct addrinfo *ai_next; }; +const char *gai_strerror (int); + +int getaddrinfo (const char *node, const char *service, + const struct addrinfo *hints, struct addrinfo **res); void freeaddrinfo (struct addrinfo *res); +int getnameinfo (const struct sockaddr *sa, socklen_t salen, + char *host, int hostlen, char *serv, int servlen, + int flags); + +/* OS/2 does not support IPv6, yet. But declare these only for compilation */ +# include <stdint.h> + +struct in6_addr +{ + uint8_t s6_addr[16]; +}; + +struct sockaddr_in6 +{ + uint8_t sin6_len; + uint8_t sin6_family; + uint16_t sin6_port; + uint32_t sin6_flowinfo; + struct in6_addr sin6_addr; + uint32_t sin6_scope_id; +}; + +# define IN6_IS_ADDR_MULTICAST(a) (((__const uint8_t *) (a))[0] == 0xff) + +static const struct in6_addr in6addr_any = + { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; # include <errno.h> # ifndef EPROTO diff --git a/include/vlc_network.h b/include/vlc_network.h index 6100cc9..184c23a 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -55,11 +55,6 @@ # include <netdb.h> # define net_errno errno # define net_Close(fd) ((void)vlc_close(fd)) -# ifdef __OS2__ -# define SHUT_RD 0 -# define SHUT_WR 1 -# define SHUT_RDWR 2 -# endif #endif #ifndef MSG_NOSIGNAL @@ -206,57 +201,12 @@ VLC_API int vlc_close(int); # endif #endif -#ifdef __OS2__ -# ifndef NI_NUMERICHOST -# define NI_NUMERICHOST 0x01 -# define NI_NUMERICSERV 0x02 -# define NI_NOFQDN 0x04 -# define NI_NAMEREQD 0x08 -# define NI_DGRAM 0x10 -# endif - -# define AI_PASSIVE 1 -# define AI_CANONNAME 2 -# define AI_NUMERICHOST 4 - -VLC_API const char *gai_strerror( int errnum ); - -VLC_API int getaddrinfo ( const char *, const char *, - const struct addrinfo *, struct addrinfo ** ); -VLC_API void freeaddrinfo( struct addrinfo * ); -VLC_API int getnameinfo ( const struct sockaddr *, socklen_t, - char *, int, char *, int, int ); -#endif - VLC_API int vlc_getnameinfo( const struct sockaddr *, int, char *, int, int *, int ); VLC_API int vlc_getaddrinfo (const char *, unsigned, const struct addrinfo *, struct addrinfo **); VLC_API int vlc_getaddrinfo_i11e(const char *, unsigned, const struct addrinfo *, struct addrinfo **); -#ifdef __OS2__ -/* OS/2 does not support IPv6, yet. But declare these only for compilation */ -struct in6_addr -{ - uint8_t s6_addr[16]; -}; - -struct sockaddr_in6 -{ - uint8_t sin6_len; - uint8_t sin6_family; - uint16_t sin6_port; - uint32_t sin6_flowinfo; - struct in6_addr sin6_addr; - uint32_t sin6_scope_id; -}; - -# define IN6_IS_ADDR_MULTICAST(a) (((__const uint8_t *) (a))[0] == 0xff) - -static const struct in6_addr in6addr_any = - { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; -#endif - static inline bool net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
