Commit f72f52e2 authored by KO Myung-Hun's avatar KO Myung-Hun Committed by Jean-Baptiste Kempf

vlc_network: move OS/2 stuffs to include/vlc_fixups.h

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent adb9c187
...@@ -474,6 +474,10 @@ long nrand48 (unsigned short subi[3]); ...@@ -474,6 +474,10 @@ long nrand48 (unsigned short subi[3]);
#ifdef __OS2__ #ifdef __OS2__
# undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */ # 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 */ /* GAI error codes */
# ifndef EAI_BADFLAGS # ifndef EAI_BADFLAGS
# define EAI_BADFLAGS -1 # define EAI_BADFLAGS -1
...@@ -512,11 +516,23 @@ long nrand48 (unsigned short subi[3]); ...@@ -512,11 +516,23 @@ long nrand48 (unsigned short subi[3]);
# define EAI_SYSTEM -12 # define EAI_SYSTEM -12
# endif # 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 # ifndef NI_MAXHOST
# define NI_MAXHOST 1025 # define NI_MAXHOST 1025
# define NI_MAXSERV 32 # define NI_MAXSERV 32
# endif # endif
# define AI_PASSIVE 1
# define AI_CANONNAME 2
# define AI_NUMERICHOST 4
struct addrinfo struct addrinfo
{ {
int ai_flags; int ai_flags;
...@@ -529,7 +545,37 @@ struct addrinfo ...@@ -529,7 +545,37 @@ struct addrinfo
struct addrinfo *ai_next; 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); 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> # include <errno.h>
# ifndef EPROTO # ifndef EPROTO
......
...@@ -55,11 +55,6 @@ ...@@ -55,11 +55,6 @@
# include <netdb.h> # include <netdb.h>
# define net_errno errno # define net_errno errno
# define net_Close(fd) ((void)vlc_close(fd)) # define net_Close(fd) ((void)vlc_close(fd))
# ifdef __OS2__
# define SHUT_RD 0
# define SHUT_WR 1
# define SHUT_RDWR 2
# endif
#endif #endif
#ifndef MSG_NOSIGNAL #ifndef MSG_NOSIGNAL
...@@ -206,57 +201,12 @@ VLC_API int vlc_close(int); ...@@ -206,57 +201,12 @@ VLC_API int vlc_close(int);
# endif # endif
#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_getnameinfo( const struct sockaddr *, int, char *, int, int *, int );
VLC_API int vlc_getaddrinfo (const char *, unsigned, VLC_API int vlc_getaddrinfo (const char *, unsigned,
const struct addrinfo *, struct addrinfo **); const struct addrinfo *, struct addrinfo **);
VLC_API int vlc_getaddrinfo_i11e(const char *, unsigned, VLC_API int vlc_getaddrinfo_i11e(const char *, unsigned,
const struct addrinfo *, struct addrinfo **); 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 static inline bool
net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len) net_SockAddrIsMulticast (const struct sockaddr *addr, socklen_t len)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment