| 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 |
Fixes test failures. |
|
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/evthread_pthread.c 2016-04-21 10:00:00.404456451 -0700 |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
+++ b/evthread_pthread.c 2016-04-21 10:01:55.930683110 -0700 |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
@@ -91,9 +91,7 @@ evthread_posix_get_id(void) |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
7 |
unsigned long id; |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
8 |
#endif |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
9 |
} r; |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
10 |
-#if _EVENT_SIZEOF_PTHREAD_T < _EVENT_SIZEOF_LONG |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
11 |
memset(&r, 0, sizeof(r)); |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
-#endif |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
r.thr = pthread_self(); |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
return (unsigned long)r.id; |
|
cf3796081ab1
15801008 upgrade libevent to 2.0.22
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
} |