From 475e705b2f0d757d7b6eb9698735931a68ae8f6b Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 25 Oct 2009 06:44:26 +0000 Subject: [PATCH] * ext/dl/handle.c (dlhandle_sym): fixed an invalid local variable declaration. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/dl/handle.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7460338e47..0d194e58d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Oct 25 15:44:24 2009 Nobuyoshi Nakada + + * ext/dl/handle.c (dlhandle_sym): fixed an invalid local variable + declaration. + Sun Oct 25 13:33:58 2009 Nobuyoshi Nakada * io.c (io_cntl): F_DUPFD is platform dependent. diff --git a/ext/dl/handle.c b/ext/dl/handle.c index 522d1a1dc6..dddd8d54e9 100644 --- a/ext/dl/handle.c +++ b/ext/dl/handle.c @@ -296,16 +296,16 @@ rb_dlhandle_s_sym(VALUE self, VALUE sym) static VALUE dlhandle_sym(void *handle, const char *name) { - rb_secure(2); - #if defined(HAVE_DLERROR) const char *err; # define CHECK_DLERROR if( err = dlerror() ){ func = 0; } #else # define CHECK_DLERROR #endif - void (*func)() = dlsym(handle, name); + void (*func)(); + rb_secure(2); + func = dlsym(handle, name); CHECK_DLERROR; #if defined(FUNC_STDCALL) if( !func ){ @@ -374,4 +374,4 @@ Init_dlhandle(void) rb_define_method(rb_cDLHandle, "close_enabled?", rb_dlhandle_close_enabled_p, 0); } -/* mode: c; tab-with=8; sw=8; ts=8; noexpandtab: */ +/* mode: c; tab-with=8; sw=4; ts=8; noexpandtab: */