blob: 5155c8505b842b4d5d83e6f81c900dca90520495 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
# HG changeset patch
# User Felix Janda <felix.janda@posteo.de>
# Date 1426627021 -3600
# Tue Mar 17 22:17:01 2015 +0100
# Node ID 4ca8a9e2718089a1d220d1d420ebe583be4be9e5
# Parent e965a1a534ecb6635975fae33a929dc6c06bcb50
# https://bugzilla.mozilla.org/show_bug.cgi?id=1146096
diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/netinet/sctp_os_userspace.h
--- a/netwerk/sctp/src/netinet/sctp_os_userspace.h Tue Mar 17 14:22:40 2015 -0400
+++ b/netwerk/sctp/src/netinet/sctp_os_userspace.h Tue Mar 17 22:17:01 2015 +0100
@@ -273,9 +273,11 @@
#endif
#else /* !defined(Userspace_os_Windows) */
+#ifdef __FreeBSD__
#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
+#endif /* __FreeBSD__ */
#include <sys/socket.h>
-#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(__Userspace_os_NaCl)
+#if !defined(__Userspace_os_Windows) && !defined(__Userspace_os_Darwin)
#include <pthread.h>
#endif
typedef pthread_mutex_t userland_mutex_t;
@@ -437,7 +439,7 @@
/* #include <sys/param.h> in FreeBSD defines MSIZE */
/* #include <sys/ktr.h> */
/* #include <sys/systm.h> */
-#if defined(__Userspace_os_Windows)
+#if 1
#include <user_queue.h>
#else
#include <sys/queue.h>
diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/netinet/sctp_pcb.c
--- a/netwerk/sctp/src/netinet/sctp_pcb.c Tue Mar 17 14:22:40 2015 -0400
+++ b/netwerk/sctp/src/netinet/sctp_pcb.c Tue Mar 17 22:17:01 2015 +0100
@@ -30,6 +30,9 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#define _BSD_SOURCE /* for IPPORT_RESERVED */
+#include <netdb.h>
+
#ifdef __FreeBSD__
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 277031 2015-01-11 21:55:30Z tuexen $");
diff -r e965a1a534ec -r 4ca8a9e27180 netwerk/sctp/src/user_queue.h
--- a/netwerk/sctp/src/user_queue.h Tue Mar 17 14:22:40 2015 -0400
+++ b/netwerk/sctp/src/user_queue.h Tue Mar 17 22:17:01 2015 +0100
@@ -31,7 +31,7 @@
#ifndef _USER_QUEUE_H_
#define _USER_QUEUE_H_
-#if !defined (__Userspace_os_Windows)
+#if defined(__Userspace_os_FreeBSD)
#include <sys/cdefs.h>
#endif
/*
|
GitWeb
