diff options
| author | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-09 08:33:36 +0000 |
|---|---|---|
| committer | mvanbaak <mvanbaak@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-09 08:33:36 +0000 |
| commit | 8413803739543d1f685dc3c5d03b23811c8a8679 (patch) | |
| tree | b4eb081ae3553900ecb0f3dabb4afafcd419b7fe /main | |
| parent | ed4c3cd1f04b4803afe7b6c040f3e210672693c2 (diff) | |
Merged revisions 205532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r205532 | mvanbaak | 2009-07-09 10:31:24 +0200 (Thu, 09 Jul 2009) | 5 lines
pthread_self returns a pthread_t which is not an unsigned int on all
pthread implementations. Casting it to an unsigned int fixes compiler warnings.
Tested on OpenBSD and Linux both 32 and 64 bit
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@205534 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/ssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/ssl.c b/main/ssl.c index 99c2cb4a8..40129f84f 100644 --- a/main/ssl.c +++ b/main/ssl.c @@ -45,7 +45,7 @@ static int ssl_num_locks; static unsigned long ssl_threadid(void) { - return pthread_self(); + return (unsigned long)pthread_self(); } static void ssl_lock(int mode, int n, const char *file, int line) |