Merge pull request libevent#38 from NathanFrench/ssl_thread_updates

Update OpenSSL example to reflect newer versions

examples_R6a/R6a_ssl_lock_init.c

@@ -14,12 +14,28 @@
 pthread_mutex_t * ssl_locks;
 int ssl_num_locks;
 
+#ifndef WIN32
+#define _SSLtid (unsigned long)pthread_self()
+#else
+#define _SSLtid pthread_self().p
+#endif
+
 /* Implements a thread-ID function as requied by openssl */
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
 static unsigned long
 get_thread_id_cb(void)
 {
- return (unsigned long)pthread_self();
+ return _SSLtid;
+}
+
+#else
+
+static void
+get_thread_id_cb(CRYPTO_THREADID *id)
+{
+ CRYPTO_THREADID_set_numeric(id, _SSLtid);
 }
+#endif
 
 static void
 thread_lock_cb(int mode, int which, const char * f, int l)
@@ -47,7 +63,13 @@ init_ssl_locking(void)
  pthread_mutex_init(&(ssl_locks[i]), NULL);
  }
 
+
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
  CRYPTO_set_id_callback(get_thread_id_cb);
+#else
+ CRYPTO_THREADID_set_callback(get_thread_id_cb);
+#endif
+
  CRYPTO_set_locking_callback(thread_lock_cb);
 
  return 0;