[ruby-dev:26109] check for function attribute

なかだです。

今rubyio.hではgcc 3.3以降のみ__attribute__を使ってDEPRECATED()
を定義していますが、同等のものがMicrosoft Visual C++ 7.0以降に
もあるようです。また、stdcallなど他のものにも対応できるはずです。


* configure.in (RUBY_FUNC_ATTRIBUTE): check for function attribute.

* ruby.h, rubyio.h (DEPRECATED): moved to configure.in.

* win{32,ce}/Makefile.sub (config.h): __declspec(deprecated) is
  available for VC++7 or later.


Index: configure.in
===================================================================
RCS file: /cvs/ruby/src/ruby/configure.in,v
retrieving revision 1.274
diff -U2 -p -r1.274 configure.in
--- configure.in	20 Apr 2005 21:45:39 -0000	1.274
+++ configure.in	29 Apr 2005 00:00:00 -0000
@@ -264,14 +264,23 @@ if test "$rb_cv_stdarg" = yes; then
 fi
 
-AC_CACHE_CHECK([for noreturn], rb_cv_noreturn,
-[rb_cv_noreturn=x
-for mac in "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
+AC_DEFUN(RUBY_FUNC_ATTRIBUTE, [dnl
+m4_ifval([$2], dnl
+  [AS_VAR_PUSHDEF([attrib],[$2])], dnl
+  [AS_VAR_PUSHDEF([attrib],AS_TR_CPP($1))] dnl
+)dnl
+AC_CACHE_CHECK(for [$1] function attribute, rb_cv_[$1],
+[rb_cv_[$1]=x
+for mac in "x __attribute__ (($1))" "__declspec($1) x" x; do
   AC_TRY_COMPILE(
-    [#define NORETURN(x) $mac
-NORETURN(void exit(int x));],
-    [],
-    [rb_cv_noreturn="$mac"; break])
+    [#define ]attrib[(x) $mac
+    ]attrib[(void conftest_attribute_check(void));], [],
+    [rb_cv_[$1]="$mac"; break])
 done])
-AC_DEFINE_UNQUOTED([NORETURN(x)], $rb_cv_noreturn)
+AC_DEFINE_UNQUOTED(attrib[(x)], $rb_cv_[$1])
+AS_VAR_POPDEF([attrib])
+])
+
+RUBY_FUNC_ATTRIBUTE(noreturn)
+RUBY_FUNC_ATTRIBUTE(deprecated)
 
 dnl Check whether we need to define sys_nerr locally
Index: ruby.h
===================================================================
RCS file: /cvs/ruby/src/ruby/ruby.h,v
retrieving revision 1.110
diff -U2 -p -r1.110 ruby.h
--- ruby.h	2 Mar 2005 08:11:28 -0000	1.110
+++ ruby.h	29 Apr 2005 00:00:00 -0000
@@ -57,4 +57,7 @@ extern "C" {
 # define NORETURN(x) x
 #endif
+#ifndef DEPRECATED
+# define DEPRECATED(x) x
+#endif
 
 #if defined(HAVE_ALLOCA_H)
Index: rubyio.h
===================================================================
RCS file: /cvs/ruby/src/ruby/rubyio.h,v
retrieving revision 1.37
diff -U2 -p -r1.37 rubyio.h
--- rubyio.h	7 Feb 2005 14:18:40 -0000	1.37
+++ rubyio.h	29 Apr 2005 00:00:00 -0000
@@ -100,13 +100,4 @@ int rb_io_read_pending _((OpenFile*));
 void rb_read_check _((FILE*));
 
-#ifdef __GNUC__
-# if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
-#  define DEPRECATED(x) x __attribute__ ((deprecated))
-# endif
-#endif
-#ifndef DEPRECATED
-# define DEPRECATED(x) x
-#endif
-
 DEPRECATED(int rb_getc _((FILE*)));
 DEPRECATED(long rb_io_fread _((char *, long, FILE *)));
Index: win32/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/win32/Makefile.sub,v
retrieving revision 1.92
diff -U2 -p -r1.92 Makefile.sub
--- win32/Makefile.sub	27 Apr 2005 14:42:37 -0000	1.92
+++ win32/Makefile.sub	29 Apr 2005 00:00:00 -0000
@@ -221,4 +221,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/
 #define NORETURN(x) __declspec(noreturn) x
 #endif
+#if _MSC_VER >= 1300
+#define DEPRECATED(x) __declspec(deprecated) x
+#endif
 #define HAVE_DECL_SYS_NERR 1
 #define HAVE_LIMITS_H 1
Index: wince/Makefile.sub
===================================================================
RCS file: /cvs/ruby/src/ruby/wince/Makefile.sub,v
retrieving revision 1.36
diff -U2 -p -r1.36 Makefile.sub
--- wince/Makefile.sub	20 Apr 2005 21:45:43 -0000	1.36
+++ wince/Makefile.sub	29 Apr 2005 00:00:00 -0000
@@ -224,4 +224,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/
 #define NORETURN(x) __declspec(noreturn) x
 #endif
+#if _MSC_VER >= 1300
+#define DEPRECATED(x) __declspec(deprecated) x
+#endif
 #define HAVE_DECL_SYS_NERR 1
 #define HAVE_FCNTL_H 1


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦