ruby-changes:16027
From: yugui <ko1@a...>
Date: Sun, 23 May 2010 21:19:08 +0900 (JST)
Subject: [ruby-changes:16027] Ruby:r27976 (ruby_1_9_2): merges r27944 from trunk into ruby_1_9_2.
yugui 2010-05-23 21:18:51 +0900 (Sun, 23 May 2010) New Revision: 27976 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27976 Log: merges r27944 from trunk into ruby_1_9_2. -- * suppress warnings. Modified files: branches/ruby_1_9_2/debug.c branches/ruby_1_9_2/dln.c branches/ruby_1_9_2/ext/dl/cfunc.c branches/ruby_1_9_2/ext/dl/cptr.c branches/ruby_1_9_2/ext/dl/handle.c branches/ruby_1_9_2/ext/openssl/ossl_ssl.c branches/ruby_1_9_2/ext/socket/ancdata.c branches/ruby_1_9_2/ext/socket/unixsocket.c branches/ruby_1_9_2/ext/syck/yamlbyte.h branches/ruby_1_9_2/gc.c branches/ruby_1_9_2/ruby.c Index: ruby_1_9_2/debug.c =================================================================== --- ruby_1_9_2/debug.c (revision 27975) +++ ruby_1_9_2/debug.c (revision 27976) @@ -27,7 +27,6 @@ enum { RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX, RUBY_ENCODING_SHIFT = ENCODING_SHIFT, - RUBY_ENCODING_MASK = ENCODING_MASK, RUBY_ENC_CODERANGE_MASK = ENC_CODERANGE_MASK, RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN, RUBY_ENC_CODERANGE_7BIT = ENC_CODERANGE_7BIT, @@ -70,6 +69,7 @@ const VALUE RUBY_FL_USER19 = FL_USER19; const SIGNED_VALUE RUBY_NODE_LMASK = NODE_LMASK; +const VALUE RUBY_ENCODING_MASK = ENCODING_MASK; int ruby_debug_print_indent(int level, int debug_level, int indent_level) Index: ruby_1_9_2/gc.c =================================================================== --- ruby_1_9_2/gc.c (revision 27975) +++ ruby_1_9_2/gc.c (revision 27976) @@ -1808,7 +1808,7 @@ add_freelist(objspace, p); } else { - struct heaps_slot *slot = (struct heaps_slot *)RDATA(p)->dmark; + struct heaps_slot *slot = (struct heaps_slot *)(VALUE)RDATA(p)->dmark; slot->limit--; } p = tmp; @@ -1908,7 +1908,7 @@ RVALUE *pp; for (pp = final_list; pp != final; pp = pp->as.free.next) { - RDATA(pp)->dmark = (void *)&heaps[i]; + RDATA(pp)->dmark = (void (*)())(VALUE)&heaps[i]; pp->as.free.flags |= FL_SINGLETON; /* freeing page mark */ } heaps[i].limit = final_num; Index: ruby_1_9_2/dln.c =================================================================== --- ruby_1_9_2/dln.c (revision 27975) +++ ruby_1_9_2/dln.c (revision 27976) @@ -1278,7 +1278,7 @@ goto failed; } - init_fct = (void(*)())dlsym(handle, buf); + init_fct = (void(*)())(VALUE)dlsym(handle, buf); #if defined __SYMBIAN32__ if (init_fct == NULL) { init_fct = (void(*)())dlsym(handle, "1"); /* Some Symbian versions do not support symbol table in DLL, ordinal numbers only */ Index: ruby_1_9_2/ext/dl/cfunc.c =================================================================== --- ruby_1_9_2/ext/dl/cfunc.c (revision 27975) +++ ruby_1_9_2/ext/dl/cfunc.c (revision 27976) @@ -82,7 +82,7 @@ rb_secure(4); if( func ){ val = TypedData_Make_Struct(rb_cDLCFunc, struct cfunc_data, &dlcfunc_data_type, data); - data->ptr = func; + data->ptr = (void *)(VALUE)func; data->name = name ? strdup(name) : NULL; data->type = type; data->calltype = calltype; @@ -306,9 +306,11 @@ } -# define DECL_FUNC_CDECL(f,ret,args) ret (FUNC_CDECL(*f))(args) +# define DECL_FUNC_CDECL(f,ret,args,val) \ + ret (FUNC_CDECL(*f))(args) = (ret (FUNC_CDECL(*))(args))(VALUE)(val) #ifdef FUNC_STDCALL -# define DECL_FUNC_STDCALL(f,ret,args) ret (FUNC_STDCALL(*f))(args) +# define DECL_FUNC_STDCALL(f,ret,args,val) \ + ret (FUNC_STDCALL(*f))(args) = (ret (FUNC_STDCALL(*))(args))(VALUE)(val) #endif #define CALL_CASE switch( RARRAY_LEN(ary) ){ \ @@ -376,7 +378,7 @@ switch( cfunc->type ){ case DLTYPE_VOID: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n,cfunc->ptr); \ f(DLSTACK_ARGS##n(stack)); \ result = Qnil; \ } @@ -385,7 +387,7 @@ break; case DLTYPE_VOIDP: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n,cfunc->ptr); \ void * ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = PTR2NUM(ret); \ @@ -395,7 +397,7 @@ break; case DLTYPE_CHAR: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n,cfunc->ptr); \ char ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = CHR2FIX(ret); \ @@ -405,7 +407,7 @@ break; case DLTYPE_SHORT: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n,cfunc->ptr); \ short ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = INT2NUM((int)ret); \ @@ -415,7 +417,7 @@ break; case DLTYPE_INT: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n,cfunc->ptr); \ int ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = INT2NUM(ret); \ @@ -425,7 +427,7 @@ break; case DLTYPE_LONG: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n,cfunc->ptr); \ long ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = LONG2NUM(ret); \ @@ -436,7 +438,7 @@ #if HAVE_LONG_LONG /* used in ruby.h */ case DLTYPE_LONG_LONG: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO##n,cfunc->ptr); \ LONG_LONG ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = LL2NUM(ret); \ @@ -447,7 +449,7 @@ #endif case DLTYPE_FLOAT: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,float,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,float,DLSTACK_PROTO##n,cfunc->ptr); \ float ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = rb_float_new(ret); \ @@ -457,7 +459,7 @@ break; case DLTYPE_DOUBLE: #define CASE(n) case n: { \ - DECL_FUNC_CDECL(f,double,DLSTACK_PROTO##n) = cfunc->ptr; \ + DECL_FUNC_CDECL(f,double,DLSTACK_PROTO##n,cfunc->ptr); \ double ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = rb_float_new(ret); \ @@ -475,7 +477,7 @@ switch( cfunc->type ){ case DLTYPE_VOID: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n##_,cfunc->ptr); \ f(DLSTACK_ARGS##n(stack)); \ result = Qnil; \ } @@ -484,7 +486,7 @@ break; case DLTYPE_VOIDP: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n##_,cfunc->ptr); \ void * ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = PTR2NUM(ret); \ @@ -494,7 +496,7 @@ break; case DLTYPE_CHAR: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n##_,cfunc->ptr); \ char ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = CHR2FIX(ret); \ @@ -504,7 +506,7 @@ break; case DLTYPE_SHORT: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n##_,cfunc->ptr); \ short ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = INT2NUM((int)ret); \ @@ -514,7 +516,7 @@ break; case DLTYPE_INT: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n##_,cfunc->ptr); \ int ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = INT2NUM(ret); \ @@ -524,7 +526,7 @@ break; case DLTYPE_LONG: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n##_,cfunc->ptr); \ long ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = LONG2NUM(ret); \ @@ -535,7 +537,7 @@ #if HAVE_LONG_LONG /* used in ruby.h */ case DLTYPE_LONG_LONG: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO##n##_,cfunc->ptr); \ LONG_LONG ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = LL2NUM(ret); \ @@ -546,7 +548,7 @@ #endif case DLTYPE_FLOAT: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO##n##_,cfunc->ptr); \ float ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = rb_float_new(ret); \ @@ -556,7 +558,7 @@ break; case DLTYPE_DOUBLE: #define CASE(n) case n: { \ - DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO##n##_) = cfunc->ptr; \ + DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO##n##_,cfunc->ptr); \ double ret; \ ret = f(DLSTACK_ARGS##n(stack)); \ result = rb_float_new(ret); \ Index: ruby_1_9_2/ext/dl/cptr.c =================================================================== --- ruby_1_9_2/ext/dl/cptr.c (revision 27975) +++ ruby_1_9_2/ext/dl/cptr.c (revision 27976) @@ -16,9 +16,9 @@ return NULL; } if (rb_dlcfunc_kind_p(func)) { - return RCFUNC_DATA(func)->ptr; + return (freefunc_t)(VALUE)RCFUNC_DATA(func)->ptr; } - return NUM2PTR(rb_Integer(func)); + return (freefunc_t)(VALUE)NUM2PTR(rb_Integer(func)); } static ID id_to_ptr; Index: ruby_1_9_2/ext/dl/handle.c =================================================================== --- ruby_1_9_2/ext/dl/handle.c (revision 27975) +++ ruby_1_9_2/ext/dl/handle.c (revision 27976) @@ -305,7 +305,7 @@ void (*func)(); rb_secure(2); - func = dlsym(handle, name); + func = (void (*)())(VALUE)dlsym(handle, name); CHECK_DLERROR; #if defined(FUNC_STDCALL) if( !func ){ Index: ruby_1_9_2/ext/openssl/ossl_ssl.c =================================================================== --- ruby_1_9_2/ext/openssl/ossl_ssl.c (revision 27975) +++ ruby_1_9_2/ext/openssl/ossl_ssl.c (revision 27976) @@ -16,7 +16,7 @@ # include <unistd.h> /* for read(), and write() */ #endif -#define numberof(ary) (sizeof(ary)/sizeof(ary[0])) +#define numberof(ary) (int)(sizeof(ary)/sizeof(ary[0])) #ifdef _WIN32 # define TO_SOCKET(s) _get_osfhandle(s) @@ -103,7 +103,7 @@ const char *name; SSL_METHOD *(*func)(void); } ossl_ssl_method_tab[] = { -#define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method } +#define OSSL_SSL_METHOD_ENTRY(name) { #name, (SSL_METHOD *(*)(void))name##_method } OSSL_SSL_METHOD_ENTRY(TLSv1), OSSL_SSL_METHOD_ENTRY(TLSv1_server), OSSL_SSL_METHOD_ENTRY(TLSv1_client), @@ -1428,7 +1428,7 @@ rb_warning("SSL session is not started yet."); return Qnil; } - cipher = SSL_get_current_cipher(ssl); + cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl); return ossl_ssl_cipher_to_ary(cipher); } Index: ruby_1_9_2/ext/socket/ancdata.c =================================================================== --- ruby_1_9_2/ext/socket/ancdata.c (revision 27975) +++ ruby_1_9_2/ext/socket/ancdata.c (revision 27976) @@ -262,8 +262,7 @@ if (level != SOL_SOCKET || type != SCM_RIGHTS) rb_raise(rb_eTypeError, "SCM_RIGHTS ancillary data expected"); - VALUE v = rb_attr_get(self, rb_intern("unix_rights")); - return v; + return rb_attr_get(self, rb_intern("unix_rights")); } #else #define ancillary_unix_rights rb_f_notimplement Index: ruby_1_9_2/ext/socket/unixsocket.c =================================================================== --- ruby_1_9_2/ext/socket/unixsocket.c (revision 27975) +++ ruby_1_9_2/ext/socket/unixsocket.c (revision 27976) @@ -472,9 +472,9 @@ unix_s_socketpair(int argc, VALUE *argv, VALUE klass) { VALUE domain, type, protocol; - domain = INT2FIX(PF_UNIX); VALUE args[3]; + domain = INT2FIX(PF_UNIX); rb_scan_args(argc, argv, "02", &type, &protocol); if (argc == 0) type = INT2FIX(SOCK_STREAM); Index: ruby_1_9_2/ext/syck/yamlbyte.h =================================================================== --- ruby_1_9_2/ext/syck/yamlbyte.h (revision 27975) +++ ruby_1_9_2/ext/syck/yamlbyte.h (revision 27976) @@ -82,6 +82,7 @@ YAMLBYTE_E_WRITE = 'W', /* output stream write error */ YAMLBYTE_E_OTHER = '?', /* some other error condition */ YAMLBYTE_E_PARSE = 'P', /* parse error, check bytecodes */ + YAMLBYTE_MAX } yamlbyte_result_t; typedef const yamlbyte_char_t *yamlbyte_buff_t; Index: ruby_1_9_2/ruby.c =================================================================== --- ruby_1_9_2/ruby.c (revision 27975) +++ ruby_1_9_2/ruby.c (revision 27976) @@ -369,7 +369,7 @@ _execname(libpath, sizeof(libpath) - 1); #elif defined(HAVE_DLADDR) Dl_info dli; - if (dladdr(expand_include_path, &dli)) { + if (dladdr((void *)(VALUE)expand_include_path, &dli)) { VALUE fname = rb_str_new_cstr(dli.dli_fname); sopath = rb_file_absolute_path(fname, Qnil); rb_str_resize(fname, 0); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/