From: Michiel van Baak <michiel@vanbaak.info>
Date: Thu, 9 Jul 2009 08:33:36 +0000 (+0000)
Subject: Merged revisions 205532 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d721eb39b84c14bc2050097e1ad058dc2eab5a7b;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@205534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/ssl.c b/main/ssl.c
index 99c2cb4a89..40129f84f5 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)