diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-08 22:20:05 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-08 22:20:05 +0000 |
| commit | e41809bb27ab03446b198535f57b0e00b75b0433 (patch) | |
| tree | 493151170438b2ed75c966d03aba4e19d7ea96de /include/ruby/ruby.h | |
| parent | 0915e876e47b683aa36668e8130638a1ee31888c (diff) | |
| download | ruby-e41809bb27ab03446b198535f57b0e00b75b0433.tar.gz | |
* include/ruby/{defines,ruby}.h: need to define function attributes
alternatives in defines.h instead of ruby.h, because they are used
in oniguruma.h and the header used without including ruby.h at
encoding library sources.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/ruby.h')
| -rw-r--r-- | include/ruby/ruby.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index c83c83406b..c7b1f41a7f 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -35,28 +35,6 @@ extern "C" { #include "defines.h" -#define NORETURN_STYLE_NEW 1 -#ifndef CONSTFUNC -# define CONSTFUNC(x) x -#endif -#ifndef PUREFUNC -# define PUREFUNC(x) x -#endif -#ifndef NORETURN -# define NORETURN(x) x -#endif -#ifndef DEPRECATED -# define DEPRECATED(x) x -#endif -#ifndef DEPRECATED_BY -# define DEPRECATED_BY(n,x) DEPRECATED(x) -#endif -#ifndef DEPRECATED_TYPE -# define DEPRECATED_TYPE(mesg, decl) decl -#endif -#ifndef NOINLINE -# define NOINLINE(x) x -#endif #ifndef ASSUME # ifdef UNREACHABLE # define ASSUME(x) (RB_LIKELY(!!(x)) ? (void)0 : UNREACHABLE) @@ -68,22 +46,6 @@ extern "C" { # define UNREACHABLE ((void)0) /* unreachable */ #endif -/* likely */ -#if __GNUC__ >= 3 -#define RB_LIKELY(x) (__builtin_expect(!!(x), 1)) -#define RB_UNLIKELY(x) (__builtin_expect(!!(x), 0)) -#else /* __GNUC__ >= 3 */ -#define RB_LIKELY(x) (x) -#define RB_UNLIKELY(x) (x) -#endif /* __GNUC__ >= 3 */ - -#ifdef __GNUC__ -#define PRINTF_ARGS(decl, string_index, first_to_check) \ - decl __attribute__((format(printf, string_index, first_to_check))) -#else -#define PRINTF_ARGS(decl, string_index, first_to_check) decl -#endif - #define RUBY_MACRO_SELECT(base, n) TOKEN_PASTE(base, n) #ifdef HAVE_INTRINSICS_H |