crypto: cast uv_thread_t to unsigned long

saghul · trevnorris · commit 0308ad2ce53f · 2014-11-26T15:57:21.000-08:00
Should work in all platforms and it fixes this compilation problem on OSX: ../src/node_crypto.cc:154:3: error: no matching function for call to 'CRYPTO_THREADID_set_numeric' CRYPTO_THREADID_set_numeric(tid, uv_thread_self()); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../deps/openssl/openssl/include/openssl/../../crypto/crypto.h:435:6: note: candidate function not viable: no known conversion from 'uv_thread_t' (aka '_opaque_pthread_t *') to 'unsigned long' for 2nd argument void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val); ^ 1 error generated. PR-URL: nodejs/node-v0.x-archive#8785 Reviewed-by: Trevor Norris <trev.norris@gmail.com>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -151,7 +151,7 @@ template int SSLWrap<TLSCallbacks>::TLSExtStatusCallback(SSL* s, void* arg);
 
 
 static void crypto_threadid_cb(CRYPTO_THREADID* tid) {
-  CRYPTO_THREADID_set_numeric(tid, uv_thread_self());
+  CRYPTO_THREADID_set_numeric(tid, (unsigned long) uv_thread_self());
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ template int SSLWrap<TLSCallbacks>::TLSExtStatusCallback(SSL* s, void* arg);`
`151`	`151`
`152`	`152`
`153`	`153`	`static void crypto_threadid_cb(CRYPTO_THREADID* tid) {`
`154`		`- CRYPTO_THREADID_set_numeric(tid, uv_thread_self());`
	`154`	`+ CRYPTO_THREADID_set_numeric(tid, (unsigned long) uv_thread_self());`
`155`	`155`	`}`
`156`	`156`
`157`	`157`