[asterisk-commits] mvanbaak: branch 1.6.1 r205534 - in /branches/1.6.1: ./ main/ssl.c

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Thu Jul  9 03:33:36 2009
New Revision: 205534

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=205534
Log:
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
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/ssl.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/ssl.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/ssl.c?view=diff&rev=205534&r1=205533&r2=205534
==============================================================================
--- branches/1.6.1/main/ssl.c (original)
+++ branches/1.6.1/main/ssl.c Thu Jul  9 03:33:36 2009
@@ -45,7 +45,7 @@
 
 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)