diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-07 20:19:02 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-07 20:19:02 +0000 |
| commit | 7d03eb2a791714b19825146b6cb731ea10c9f4ca (patch) | |
| tree | 89d5f23aae49598cab978ccb784604fdccb90526 | |
| parent | 524321421920f031158210af68b238db190b6fcb (diff) | |
| parent | dfd687bb8ef6224a1e3c38a7de9e79e854b142ad (diff) | |
| download | usrsctplib-7d03eb2a791714b19825146b6cb731ea10c9f4ca.tar.gz | |
Merge third_party/usrsctp/usrsctplib from https://chromium.googlesource.com/external/usrsctplib.git at dfd687bb8ef6224a1e3c38a7de9e79e854b142ad
This commit was generated by merge_from_chromium.py.
Change-Id: If72e0e4ae1dc864d34a51f51cbd44a9c56c57b1f
| -rwxr-xr-x | netinet/sctp_os_userspace.h | 12 | ||||
| -rwxr-xr-x | netinet/sctp_output.c | 9 |
2 files changed, 8 insertions, 13 deletions
diff --git a/netinet/sctp_os_userspace.h b/netinet/sctp_os_userspace.h index e8de92f..a8d1f08 100755 --- a/netinet/sctp_os_userspace.h +++ b/netinet/sctp_os_userspace.h @@ -270,11 +270,6 @@ typedef char* caddr_t; #define BYTE_ORDER LITTLE_ENDIAN #endif -int Win_getifaddrs(struct ifaddrs**); -#define getifaddrs(interfaces) (int)Win_getifaddrs(interfaces) -int win_if_nametoindex(const char *); -#define if_nametoindex(x) win_if_nametoindex(x) - #else /* !defined(Userspace_os_Windows) */ #include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */ #include <sys/socket.h> @@ -416,6 +411,13 @@ struct ifreq { #endif +#if defined(__Userspace_os_Windows) +int Win_getifaddrs(struct ifaddrs**); +#define getifaddrs(interfaces) (int)Win_getifaddrs(interfaces) +int win_if_nametoindex(const char *); +#define if_nametoindex(x) win_if_nametoindex(x) +#endif + #define mtx_lock(arg1) #define mtx_unlock(arg1) #define mtx_assert(arg1,arg2) diff --git a/netinet/sctp_output.c b/netinet/sctp_output.c index 5ef7879..9502cc6 100755 --- a/netinet/sctp_output.c +++ b/netinet/sctp_output.c @@ -32,7 +32,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 271670 2014-09-16 10:57:55Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 272571 2014-10-05 20:30:49Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -7200,13 +7200,6 @@ sctp_sendall_completes(void *ptr, uint32_t val SCTP_UNUSED) SCTP_FREE(ca, SCTP_M_COPYAL); } - -#define MC_ALIGN(m, len) do { \ - SCTP_BUF_RESV_UF(m, ((MCLBYTES - (len)) & ~(sizeof(long) - 1)); \ -} while (0) - - - static struct mbuf * sctp_copy_out_all(struct uio *uio, int len) { |