| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Sat, 24 Sep 2016 09:29:15 -0700 | |
| changeset 6971 | 32152bc508b7 |
| parent 5921 | cf3796081ab1 |
| permissions | -rw-r--r-- |
|
5921
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
1 |
Function needs extern keyword. |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
2 |
In house patch. |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
3 |
|
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
4 |
--- a/arc4random.c 2016-03-01 09:29:36.602447178 -0800 |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
+++ b/arc4random.c 2016-03-01 10:17:51.627857034 -0800 |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
@@ -445,8 +445,8 @@ arc4random_stir(void) |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
7 |
#endif |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
8 |
|
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
#ifndef ARC4RANDOM_NOADDRANDOM |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
-ARC4RANDOM_EXPORT void |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
-arc4random_addrandom(const unsigned char *dat, int datlen) |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
+extern void |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
+arc4random_addrandom(uchar_t *dat, size_t datlen) |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
{
|
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
int j; |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
_ARC4_LOCK(); |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
@@ -477,7 +477,7 @@ arc4random(void) |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
18 |
} |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
#endif |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
20 |
|
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
21 |
-ARC4RANDOM_EXPORT void |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
22 |
+extern void |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
23 |
arc4random_buf(void *_buf, size_t n) |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
24 |
{
|
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
25 |
unsigned char *buf = _buf; |