summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-10 02:19:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-10 02:19:54 +0000
commit84c08bc3b8ed00251d72d468c46a914426ccc358 (patch)
tree9fdcb405e17915a280ae0d6191d081c6c1c11aa7 /ext
parentb72bd6c0806a2b40e99e7e73aa292e7daf2648c7 (diff)
ossl.c: fix argument type
* ext/openssl/ossl.c (ossl_lock_callback): fix argument type, and remove redundant casts. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/openssl/ossl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 502907791bc..f213f3c4cd6 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -463,7 +463,7 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
*/
static VALUE* ossl_locks;
-static void ossl_lock_callback(int mode, int type, char *file, int line)
+static void ossl_lock_callback(int mode, int type, const char *file, int line)
{
if (mode & CRYPTO_LOCK) {
rb_mutex_lock(ossl_locks[type]);
@@ -494,8 +494,8 @@ static void Init_ossl_locks(void)
rb_gc_register_mark_object(ossl_locks[i]);
}
- CRYPTO_set_id_callback((unsigned long (*)())ossl_thread_id);
- CRYPTO_set_locking_callback((void (*)())ossl_lock_callback);
+ CRYPTO_set_id_callback(ossl_thread_id);
+ CRYPTO_set_locking_callback(ossl_lock_callback);
}
/*