diff options
Diffstat (limited to 'chromium/third_party/usrsctp/usrsctplib/netinet/sctp_os_userspace.h')
| -rwxr-xr-x | chromium/third_party/usrsctp/usrsctplib/netinet/sctp_os_userspace.h | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/chromium/third_party/usrsctp/usrsctplib/netinet/sctp_os_userspace.h b/chromium/third_party/usrsctp/usrsctplib/netinet/sctp_os_userspace.h index dc4e28025d5..f863295b43d 100755 --- a/chromium/third_party/usrsctp/usrsctplib/netinet/sctp_os_userspace.h +++ b/chromium/third_party/usrsctp/usrsctplib/netinet/sctp_os_userspace.h @@ -77,25 +77,32 @@ typedef HANDLE userland_thread_t; #define ADDRESS_FAMILY unsigned __int8 #define IPVERSION 4 #define MAXTTL 255 +/* VS2010 comes with stdint.h */ +#if _MSC_VER >= 1600 +#include <stdint.h> +#else #define uint64_t unsigned __int64 +#define uint32_t unsigned __int32 +#define int32_t __int32 +#define uint16_t unsigned __int16 +#define int16_t __int16 +#define uint8_t unsigned __int8 +#define int8_t __int8 +#endif +#ifndef _SIZE_T_DEFINED +#define size_t __int32 +#endif #define u_long unsigned __int64 #define u_int unsigned __int32 -#define uint32_t unsigned __int32 #define u_int32_t unsigned __int32 -#define int32_t __int32 -#define int16_t __int16 -#define uint16_t unsigned __int16 #define u_int16_t unsigned __int16 -#define uint8_t unsigned __int8 #define u_int8_t unsigned __int8 -#define int8_t __int8 #define u_char unsigned char #define n_short unsigned __int16 #define u_short unsigned __int16 -#define ssize_t __int64 -#define size_t __int32 #define n_time unsigned __int32 #define sa_family_t unsigned __int8 +#define ssize_t __int64 #define IFNAMSIZ 64 #define __func__ __FUNCTION__ @@ -217,7 +224,7 @@ int win_if_nametoindex(const char *); #define bzero(buf, len) memset(buf, 0, len) #define bcopy(srcKey, dstKey, len) memcpy(dstKey, srcKey, len) -#define snprintf(data, size, format, name) _snprintf_s(data, size, _TRUNCATE, format, name) +#define snprintf(data, size, format, ...) _snprintf_s(data, size, _TRUNCATE, format, __VA_ARGS__) #define inline __inline #define __inline__ __inline #define random() rand() @@ -395,7 +402,7 @@ struct udphdr { #else /* !defined(Userspace_os_Windows) */ #include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */ #include <sys/socket.h> -#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(__Userspace_os_Linux) +#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) #include <pthread.h> #endif typedef pthread_mutex_t userland_mutex_t; @@ -409,7 +416,9 @@ typedef pthread_t userland_thread_t; #define MA_OWNED 7 /* sys/mutex.h typically on FreeBSD */ #if !defined(__Userspace_os_FreeBSD) struct mtx {int dummy;}; +#if !defined(__Userspace_os_NetBSD) struct selinfo {int dummy;}; +#endif struct sx {int dummy;}; #endif @@ -512,7 +521,7 @@ struct sx {int dummy;}; #include <netinet/ip6.h> #include <netinet/icmp6.h> #endif -#if defined(__Userspace_os_Linux) || defined(__Userspace_os_Darwin) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) ||defined(__Userspace_os_Windows) +#if defined(__Userspace_os_Darwin) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(__Userspace_os_Windows) #include "user_ip6_var.h" #else #include <netinet6/ip6_var.h> @@ -1082,9 +1091,11 @@ sctp_get_mbuf_for_msg(unsigned int space_needed, int want_header, int how, int a /* with the current included files, this is defined in Linux but * in FreeBSD, it is behind a _KERNEL in sys/socket.h ... */ -#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) +#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) /* stolen from /usr/include/sys/socket.h */ #define CMSG_ALIGN(n) _ALIGN(n) +#elif defined(__Userspace_os_NetBSD) +#define CMSG_ALIGN(n) (((n) + __ALIGNBYTES) & ~__ALIGNBYTES) #elif defined(__Userspace_os_Darwin) #if !defined(__DARWIN_ALIGNBYTES) #define __DARWIN_ALIGNBYTES (sizeof(__darwin_size_t) - 1) @@ -1134,4 +1145,8 @@ sctp_get_mbuf_for_msg(unsigned int space_needed, int want_header, int how, int a (var) = (tvar)) #endif #endif +#if defined(__Userspace_os_DragonFly) +#define TAILQ_FOREACH_SAFE TAILQ_FOREACH_MUTABLE +#define LIST_FOREACH_SAFE LIST_FOREACH_MUTABLE +#endif #endif |