From 75554f4de0aef4cd90aa70d5c444a16401fda297 Mon Sep 17 00:00:00 2001 From: mvanbaak Date: Thu, 9 Jul 2009 08:32:42 +0000 Subject: 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.0@205533 f38db490-d61c-443f-a65b-d21fe96a405b --- main/ssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') 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) -- cgit v1.2.3