1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ossl.c: fix argument type

Browse Source 
* 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
This commit is contained in:
nobu 2013-07-10 02:19:54 +00:00
parent b72bd6c080
commit 84c08bc3b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/openssl/ossl.c
View File

@ -463,7 +463,7 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
*/ */
static VALUE* ossl_locks; 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) { if (mode & CRYPTO_LOCK) {
rb_mutex_lock(ossl_locks[type]); rb_mutex_lock(ossl_locks[type]);
@ -494,8 +494,8 @@ static void Init_ossl_locks(void)
rb_gc_register_mark_object(ossl_locks[i]); rb_gc_register_mark_object(ossl_locks[i]);
} }
CRYPTO_set_id_callback((unsigned long (*)())ossl_thread_id); CRYPTO_set_id_callback(ossl_thread_id);
CRYPTO_set_locking_callback((void (*)())ossl_lock_callback); CRYPTO_set_locking_callback(ossl_lock_callback);
} }
/* /*