diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-21 20:59:39 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-21 20:59:39 +0000 |
| commit | 54c1f479301f71156645059161e64b50ab271ad8 (patch) | |
| tree | 3b78b9e51f291cf868889bd79676d1a60e028eac | |
| parent | fe120ac1f118eb009acb76d2d7a7d6934215dcd4 (diff) | |
* include/ruby/ruby.h (LIKELY): moved from internal.h.
* include/ruby/ruby.h (UNLIKELY): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 9 | ||||
| -rw-r--r-- | internal.h | 9 |
3 files changed, 15 insertions, 9 deletions
@@ -1,3 +1,9 @@ +Fri Apr 22 04:54:40 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * include/ruby/ruby.h (LIKELY): moved from internal.h. + + * include/ruby/ruby.h (UNLIKELY): ditto. + Thu Apr 21 01:44:19 2016 NARUSE, Yui <naruse@ruby-lang.org> * gc.c (objspace_malloc_prepare): remove size check because it is diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 5c942c95ce..71a91b558f 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -62,6 +62,15 @@ extern "C" { # define UNREACHABLE ((void)0) /* unreachable */ #endif +/* likely */ +#if __GNUC__ >= 3 +#define LIKELY(x) (__builtin_expect(!!(x), 1)) +#define UNLIKELY(x) (__builtin_expect(!!(x), 0)) +#else /* __GNUC__ >= 3 */ +#define LIKELY(x) (x) +#define 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))) diff --git a/internal.h b/internal.h index f3767110cc..371cb1b83a 100644 --- a/internal.h +++ b/internal.h @@ -23,15 +23,6 @@ extern "C" { #endif #endif -/* likely */ -#if __GNUC__ >= 3 -#define LIKELY(x) (__builtin_expect(!!(x), 1)) -#define UNLIKELY(x) (__builtin_expect(!!(x), 0)) -#else /* __GNUC__ >= 3 */ -#define LIKELY(x) (x) -#define UNLIKELY(x) (x) -#endif /* __GNUC__ >= 3 */ - #ifndef __has_attribute # define __has_attribute(x) 0 #endif |