1 ARC4RANDOM_EXPORT is defined as extern. Fixes issues in arc4random and libevent. |
1 ARC4RANDOM_EXPORT is defined as extern. Fixes issues in arc4random and libevent. |
2 Solaris specific changes, will not send upstream. |
2 Solaris specific changes, will not send upstream. |
3 |
3 |
4 --- a/ipc/chromium/src/third_party/libevent/arc4random.c 2016-03-01 09:29:36.602447178 -0800 |
4 --- a/ipc/chromium/src/third_party/libevent/arc4random.c 2016-03-01 09:29:36.602447178 -0800 |
5 +++ b/ipc/chromium/src/third_party/libevent/arc4random.c 2016-03-01 10:17:51.627857034 -0800 |
5 +++ b/ipc/chromium/src/third_party/libevent/arc4random.c 2016-03-01 10:17:51.627857034 -0800 |
6 @@ -445,8 +445,8 @@ arc4random_stir(void) |
6 @@ -445,8 +449,8 @@ |
7 #endif |
7 #endif |
8 |
8 |
9 #ifndef ARC4RANDOM_NOADDRANDOM |
9 #ifndef ARC4RANDOM_NOADDRANDOM |
10 -ARC4RANDOM_EXPORT void |
10 -ARC4RANDOM_EXPORT void |
11 -arc4random_addrandom(const unsigned char *dat, int datlen) |
11 -arc4random_addrandom(const unsigned char *dat, int datlen) |
12 +extern void |
12 +extern void |
13 +arc4random_addrandom(uchar_t *dat, size_t datlen) |
13 +arc4random_addrandom(uchar_t *dat, size_t datlen) |
14 { |
14 { |
15 int j; |
15 int j; |
16 _ARC4_LOCK(); |
16 _ARC4_LOCK(); |
17 @@ -477,7 +477,7 @@ arc4random(void) |
17 @@ -477,7 +481,7 @@ |
18 } |
18 } |
19 #endif |
19 #endif |
20 |
20 |
21 -ARC4RANDOM_EXPORT void |
21 -ARC4RANDOM_EXPORT void |
22 +extern void |
22 +extern void |
23 arc4random_buf(void *_buf, size_t n) |
23 arc4random_buf(void *_buf, size_t n) |
24 { |
24 { |
25 unsigned char *buf = _buf; |
25 unsigned char *buf = _buf; |
26 --- a/config/system-headers 2015-11-03 11:34:17.000000000 +0100 |
26 --- a/config/system-headers 2015-11-03 11:34:17.000000000 +0100 |
27 +++ b/config/system-headers 2015-11-09 03:34:24.577525000 +0100 |
27 +++ b/config/system-headers 2015-11-09 03:34:24.577525000 +0100 |
28 @@ -1064,7 +1064,6 @@ |
28 @@ -1064,7 +1064,6 @@ |
29 sys/stat.h |
29 sys/stat.h |
30 sys/statvfs.h |
30 sys/statvfs.h |
44 +#endif |
44 +#endif |
45 + |
45 + |
46 #ifndef ARC4RANDOM_EXPORT |
46 #ifndef ARC4RANDOM_EXPORT |
47 #define ARC4RANDOM_EXPORT |
47 #define ARC4RANDOM_EXPORT |
48 #endif |
48 #endif |
49 @@ -59,7 +61,7 @@ |
49 @@ -59,7 +63,7 @@ |
50 #include <sys/param.h> |
50 #include <sys/param.h> |
51 #include <sys/time.h> |
51 #include <sys/time.h> |
52 #ifdef _EVENT_HAVE_SYS_SYSCTL_H |
52 #ifdef _EVENT_HAVE_SYS_SYSCTL_H |
53 -#include <sys/sysctl.h> |
53 -#include <sys/sysctl.h> |
54 +;//#include <sys/sysctl.h> |
54 +;//#include <sys/sysctl.h> |
55 #endif |
55 #endif |
56 #endif |
56 #endif |
57 #include <limits.h> |
57 #include <limits.h> |
58 --- a/ipc/chromium/moz.build 2016-03-28 13:41:06.878922929 -0700 |
58 --- a/ipc/chromium/moz.build 2016-03-28 13:41:06.878922929 -0700 |
59 +++ b/ipc/chromium/moz.build 2016-03-28 13:42:04.555448660 -0700 |
59 +++ b/ipc/chromium/moz.build 2016-03-28 13:42:04.555448660 -0700 |
60 @@ -161,6 +161,23 @@ if os_bsd or os_linux: |
60 @@ -161,6 +161,23 @@ |
61 'src/base/message_pump_qt.cc', |
61 'src/base/message_pump_qt.cc', |
62 ] |
62 ] |
63 |
63 |
64 +if os_solaris: |
64 +if os_solaris: |
65 + SOURCES += [ |
65 + SOURCES += [ |
77 + 'src/third_party/libevent/devpoll.c', |
77 + 'src/third_party/libevent/devpoll.c', |
78 + ] |
78 + ] |
79 + LOCAL_INCLUDES += ['src/third_party/libevent/solaris'] |
79 + LOCAL_INCLUDES += ['src/third_party/libevent/solaris'] |
80 + |
80 + |
81 ost = CONFIG['OS_TEST'] |
81 ost = CONFIG['OS_TEST'] |
82 if '86' not in ost and 'arm' not in ost and 'mips' not in ost: |
82 if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost: |
83 SOURCES += [ |
83 SOURCES += [ |
84 diff a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild |
84 diff a/ipc/chromium/src/third_party/libeventcommon.mozbuild b/ipc/chromium/src/third_party/libeventcommon.mozbuild |
85 --- a/ipc/chromium/src/third_party/libeventcommon.mozbuild 2015-11-03 11:34:14.000000000 +0100 |
85 --- a/ipc/chromium/src/third_party/libeventcommon.mozbuild 2015-11-03 11:34:14.000000000 +0100 |
86 +++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild 2015-11-09 03:34:24.579311000 +0100 |
86 +++ b/ipc/chromium/src/third_party/libeventcommon.mozbuild 2015-11-09 03:34:24.579311000 +0100 |
87 @@ -9,6 +9,7 @@ |
87 @@ -9,6 +9,7 @@ |
88 os_openbsd = 0 |
88 os_macosx = 0 |
89 os_bsd = 0 |
89 os_bsd = 0 |
90 os_linux = 0 |
90 os_linux = 0 |
91 +os_solaris = 0 |
91 +os_solaris = 0 |
92 |
92 |
93 if CONFIG['OS_ARCH'] == 'WINNT': |
93 if CONFIG['OS_ARCH'] == 'WINNT': |
94 os_win = 1 |
94 os_win = 1 |
95 @@ -21,6 +22,9 @@ else: |
95 @@ -21,6 +22,9 @@ |
96 'NetBSD', 'OpenBSD']: |
96 'NetBSD', 'OpenBSD']: |
97 os_bsd = 1 |
97 os_bsd = 1 |
98 libevent_include_suffix = 'bsd' |
98 libevent_include_suffix = 'bsd' |
99 + elif CONFIG['OS_ARCH'] == 'SunOS': |
99 + elif CONFIG['OS_ARCH'] == 'SunOS': |
100 + os_solaris = 1 |
100 + os_solaris = 1 |