ruby-dev

西山和広です。

Mac OS Xでmakeすると

cfunc.c:280: warning: 'cdecl' attribute directive ignored
cfunc.c:439: warning: 'stdcall' attribute directive ignored

というwarningが大量にでますが、以下のようなパッチでどうでしょうか?

gsub!(/\bDECL_FUNC\(([^,]+,[^,]+,[^,]+),\s*stdcall\)/) { "DECL_FUNC_STDCALL(#$1)" }
gsub!(/\bDECL_FUNC\(([^,]+,[^,]+,[^,]+),\s*cdecl\)/) { "DECL_FUNC_CDECL(#$1)" }
でマクロ呼び出しを置き換えて、マクロ定義部分を適当に
書き換えてみた状態です。


ruby 1.9.0 (2005-09-22) [i686-linux]で
ext/dl/test/のtest_all.rbが
32 tests, 71 assertions, 0 failures, 0 errors
になって通るのは確認しています。

このテストは他のテストと同じようにtestの下に移動した方が
良いのではないでしょうか?


Index: cfunc.c
===================================================================
RCS file: /src/ruby/ext/dl/cfunc.c,v
retrieving revision 1.4
diff -u -p -r1.4 cfunc.c
--- cfunc.c	4 Mar 2005 06:47:39 -0000	1.4
+++ cfunc.c	22 Sep 2005 20:29:38 -0000
@@ -223,10 +223,12 @@ rb_dlcfunc_inspect(VALUE self)
 }
 
 #if defined(__GNUC__)
-# define DECL_FUNC(f,ret,args,calltype)  ret (__attribute__((calltype)) *f)(args)
+# define DECL_FUNC_CDECL(f,ret,args)  ret (*FUNC_CDECL(f))(args)
+# define DECL_FUNC_STDCALL(f,ret,args)  ret (*FUNC_STDCALL(f))(args)
 /* # define DECL_FUNC(f,ret,args,calltype)  ret (*f)(args) */
 #elif defined(_MSC_VER) || defined(__BORLANDC__)
-# define DECL_FUNC(f,ret,args,calltype)  ret (__##calltype *f)(args)
+# define DECL_FUNC_CDECL(f,ret,args)  ret (__cdecl *f)(args)
+# define DECL_FUNC_STDCALL(f,ret,args)  ret (__stdcall *f)(args)
 #else
 # error "unsupported compiler."
 #endif
@@ -273,7 +275,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	switch( cfunc->type ){
 	case DLTYPE_VOID:
 #define CASE(n) case n: { \
-            DECL_FUNC(f,void,DLSTACK_PROTO##n,cdecl) = cfunc->ptr; \
+            DECL_FUNC_CDECL(f,void,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    f(DLSTACK_ARGS##n(stack)); \
 	    result = Qnil; \
 }
@@ -282,7 +284,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_VOIDP:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,void*,DLSTACK_PROTO##n,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,void*,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    void * ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = PTR2NUM(ret); \
@@ -292,7 +294,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_CHAR:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,char,DLSTACK_PROTO##n,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,char,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    char ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = CHR2FIX(ret); \
@@ -302,7 +304,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_SHORT:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,short,DLSTACK_PROTO##n,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,short,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    short ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = INT2NUM((int)ret); \
@@ -312,7 +314,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_INT:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,int,DLSTACK_PROTO##n,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,int,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    int ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = INT2NUM(ret); \
@@ -322,7 +324,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_LONG:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,long,DLSTACK_PROTO##n,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,long,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    long ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = LONG2NUM(ret); \
@@ -333,7 +335,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 #if HAVE_LONG_LONG  /* used in ruby.h */
 	case DLTYPE_LONG_LONG:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,LONG_LONG,DLSTACK_PROTO,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,LONG_LONG,DLSTACK_PROTO) = cfunc->ptr; \
 	    LONG_LONG ret; \
 	    ret = f(DLSTACK_ARGS(stack)); \
 	    result = LL2NUM(ret); \
@@ -344,7 +346,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 #endif
 	case DLTYPE_FLOAT:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,float,DLSTACK_PROTO,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,float,DLSTACK_PROTO) = cfunc->ptr; \
 	    float ret; \
 	    ret = f(DLSTACK_ARGS(stack)); \
 	    result = rb_float_new(ret); \
@@ -354,7 +356,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_DOUBLE:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,double,DLSTACK_PROTO,cdecl) = cfunc->ptr; \
+	    DECL_FUNC_CDECL(f,double,DLSTACK_PROTO) = cfunc->ptr; \
 	    double ret; \
 	    ret = f(DLSTACK_ARGS(stack)); \
 	    result = rb_float_new(ret); \
@@ -371,7 +373,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	switch( cfunc->type ){
 	case DLTYPE_VOID:
 #define CASE(n) case n: { \
-            DECL_FUNC(f,void,DLSTACK_PROTO##n,stdcall) = cfunc->ptr; \
+            DECL_FUNC_STDCALL(f,void,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    f(DLSTACK_ARGS##n(stack)); \
 	    result = Qnil; \
 }
@@ -380,7 +382,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_VOIDP:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,void*,DLSTACK_PROTO##n,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,void*,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    void * ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = PTR2NUM(ret); \
@@ -390,7 +392,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_CHAR:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,char,DLSTACK_PROTO##n,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,char,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    char ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = CHR2FIX(ret); \
@@ -400,7 +402,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_SHORT:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,short,DLSTACK_PROTO##n,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,short,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    short ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = INT2NUM((int)ret); \
@@ -410,7 +412,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_INT:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,int,DLSTACK_PROTO##n,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,int,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    int ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = INT2NUM(ret); \
@@ -420,7 +422,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_LONG:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,long,DLSTACK_PROTO##n,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,long,DLSTACK_PROTO##n) = cfunc->ptr; \
 	    long ret; \
 	    ret = f(DLSTACK_ARGS##n(stack)); \
 	    result = LONG2NUM(ret); \
@@ -431,7 +433,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 #if HAVE_LONG_LONG  /* used in ruby.h */
 	case DLTYPE_LONG_LONG:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,LONG_LONG,DLSTACK_PROTO,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,LONG_LONG,DLSTACK_PROTO) = cfunc->ptr; \
 	    LONG_LONG ret; \
 	    ret = f(DLSTACK_ARGS(stack)); \
 	    result = LL2NUM(ret); \
@@ -442,7 +444,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 #endif
 	case DLTYPE_FLOAT:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,float,DLSTACK_PROTO,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,float,DLSTACK_PROTO) = cfunc->ptr; \
 	    float ret; \
 	    ret = f(DLSTACK_ARGS(stack)); \
 	    result = rb_float_new(ret); \
@@ -452,7 +454,7 @@ rb_dlcfunc_call(VALUE self, VALUE ary)
 	    break;
 	case DLTYPE_DOUBLE:
 #define CASE(n) case n: { \
-	    DECL_FUNC(f,double,DLSTACK_PROTO,stdcall) = cfunc->ptr; \
+	    DECL_FUNC_STDCALL(f,double,DLSTACK_PROTO) = cfunc->ptr; \
 	    double ret; \
 	    ret = f(DLSTACK_ARGS(stack)); \
 	    result = rb_float_new(ret); \



-- 
|ZnZ(ゼット エヌ ゼット)
|西山和広(Kazuhiro NISHIYAMA)

Thread

Prev Next

In This Thread

Prev Next

[#26934] safe level preserved in method — nobuyoshi nakada <nobuyoshi.nakada@...>

[#26935] __send__ in lib — nobuyoshi nakada <nobuyoshi.nakada@...>

[#26942] core dump with ripper — Tanaka Akira <akr@...17n.org>

[#26944] string.c中の文字検索 — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#26952] ripper problems. — Tanaka Akira <akr@...17n.org>

[#26954] Re: core dump with ripper — Yukihiro Matsumoto <matz@...>

[#26962] Re: about Ruby-GetText — Yukihiro Matsumoto <matz@...>

[#26963] sprintf does not warn in verbose mode. — sheepman <sheepman@...>

[#26964] ripper warnings — Tanaka Akira <akr@...17n.org>

[#26965] patch for RDoc about Module#class_variable_get — sheepman <sheepman@...>

[#26967] Tempfile.new("z").extend(M) — Tanaka Akira <akr@...17n.org>

[#26975] [proposal] ANSI style function — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#26984] elimination of "extern int errno;" — Takahiro Kambe <taca@...>

[#27044] test errors and failures — nobuyoshi nakada <nobuyoshi.nakada@...>

[#27051] fail on test/rss — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27062] test/net/http/test_https_proxy.rb doesn't finish — Tanaka Akira <akr@...17n.org>

[#27077] select pipe support on native Win32 — "U.Nakamura" <usa@...>

[#27097] ruby-cvsのSubject — Kazuhiro NISHIYAMA <zn@...>

[#27102] Re: Welcome to our (ruby developers list) You are added automatically — MIYAMUKO Katsuyuki <miyamuko@...>

[#27105] Dir.glob delimiter — nobuyoshi nakada <nobuyoshi.nakada@...>

[#27111] compile error on hp-ux — MIYAMUKO Katsuyuki <miyamuko@...>

[#27122] flock and ^C — Tanaka Akira <akr@...17n.org>

[#27123] test/socket/test_tcp.rb blocks on NetBSD — Tanaka Akira <akr@...17n.org>

[#27127] can't convert Pathname into String — Tanaka Akira <akr@...17n.org>

[#27129] 1/2 under mathn — Tanaka Akira <akr@...17n.org>

[#27132] BasicSocket#send and ^C — Tanaka Akira <akr@...17n.org>

[#27133] core dump with win32ole — Masaki Suketa <masaki.suketa@...>

[#27134] syswrite and ^C — Tanaka Akira <akr@...17n.org>

[#27136] prohibit calling tainted method — sheepman <sheepman@...>

[#27139] ruby-1.8.3 status for release — Masayoshi Takahashi <maki@...>

[#27140] [PATCH] File#chown(nil, nil) — Minero Aoki <aamine@...>

[#27141] Interix3 (SFU)サポート — Takahiro Kambe <taca@...>

[#27145] test_fileutils fail — sheepman <sheepman@...>

[#27150] test_readline.rb blocks on NetBSD. — Tanaka Akira <akr@...17n.org>

[#27152] File.expand_path(Pathname.new("a")) — Tanaka Akira <akr@...17n.org>

[#27156] close error smashes an exception in a block — Tanaka Akira <akr@...17n.org>

[#27185] PIPE_BUF is not defined — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27202] test_dbm and test_gdbm on FC4 — "NAKAMURA, Hiroshi" <nakahiro@...>

[#27226] world writable dir with sticky bit — sheepman <sheepman@...>

[#27233] yaml warnig in verbose mode — sheepman <sheepman@...>

[#27242] Ruby 1.8.3 released — Yukihiro Matsumoto <matz@...>

[#27248] glob from command line still broken in djgpp? — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27251] 脆弱性レポート翻訳者募集 — Yukihiro Matsumoto <matz@...>

[#27262] [rails:373] Ruby-1.8.3正式版に変えたらエラー — take_tk <ggb03124@...>

[#27270] ext/tk/sample/demos-en/tcolor.bak — Kazuhiro NISHIYAMA <zn@...>

[#27275] release schedule plan for 1.8.4 — "NARUSE, Yui" <naruse@...>

[#27281] env -i make; fails. — "URABE Shyouhei aka.mput" <root@...>

[#27297] warning of yaml/basenode.rb — 雪見酒 <yukimi_sake@...>

[#27302] warning: 'cdecl' attribute directive ignored — Kazuhiro NISHIYAMA <zn@...>

[#27310] RSSが見えない — Kazuhiro NISHIYAMA <zn@...>

[#27312] many net/http related test failures (Re: [ruby-cvs:15621] ruby, ruby/test/net/http: * test/net/http/test_http.rb: new file.) — Tanaka Akira <akr@...17n.org>

[#27314] test/ripper error (directory cannot be opened on windows) — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27316] OptionParser doesn't raise when given h — sheepman <sheepman@...>

[#27317] sizeof(FILE) — Tanaka Akira <akr@...17n.org>

[#27318] Re: [ruby-cvs:15644] ruby, ruby/lib: * lib/optparse.rb (RequiredArgument#parse): not consume unmatched — "U.Nakamura" <usa@...>

[#27321] RubyGemsとOS platformとの関係 — Daigo Moriwaki <techml@...>

[#27324] ext/digest on DrafonFly — Takahiro Kambe <taca@...>

[#27331] possible SEGV in rb_autoload_load? — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

[#27334] File#read にゴミがつく — Yusuke ENDOH <mame@...>

[#27335] tcl 8.0 の環境で tcltklib がコンパイルできない — ENDOH Yusuke <mame@...>

[ruby-dev:27302] warning: 'cdecl' attribute directive ignored

Thread

In This Thread

[#26935] send in lib — nobuyoshi nakada <nobuyoshi.nakada@...>