mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
revert r39861
* include/ruby/ruby.h: revert r39861 because RB_UNUSED_VAR() is used for array variables in extension libraries. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39864 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ccde88c1f1
commit
7f7621e734
3 changed files with 8 additions and 11 deletions
|
@ -3,13 +3,6 @@ Thu Mar 21 23:17:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
|||
* thread.c (ruby_kill): get rid of deadlock on signal 0.
|
||||
[ruby-dev:47182] [Bug #8137]
|
||||
|
||||
Thu Mar 21 23:14:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* include/ruby/ruby.h (RB_UNUSED_VAR): move code from
|
||||
UNINITIALIZED_VAR() in vm_core.h.
|
||||
|
||||
* vm_core.h (UNINITIALIZED_VAR): use RB_UNUSED_VAR().
|
||||
|
||||
Thu Mar 21 22:39:46 2013 Naohisa Goto <ngotogenome@gmail.com>
|
||||
|
||||
* marshal.c (marshal_dump, marshal_load): workaround for segv on
|
||||
|
|
|
@ -529,10 +529,8 @@ static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr
|
|||
#endif
|
||||
#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v)))
|
||||
|
||||
#if (defined(__clang__) && (__clang_major__ == 4 && __clang_minor__ == 2))
|
||||
#ifdef __GNUC__
|
||||
#define RB_UNUSED_VAR(x) x __attribute__ ((unused))
|
||||
#elif defined(__GNUC__) && __GNUC__ >= 3
|
||||
#define RB_UNUSED_VAR(x) x = x
|
||||
#else
|
||||
#define RB_UNUSED_VAR(x) x
|
||||
#endif
|
||||
|
|
|
@ -115,7 +115,13 @@
|
|||
#define UNLIKELY(x) (x)
|
||||
#endif /* __GNUC__ >= 3 */
|
||||
|
||||
#define UNINITIALIZED_VAR(x) RB_UNUSED_VAR(x)
|
||||
#if (defined(__clang__) && (__clang_major__ == 4 && __clang_minor__ == 2))
|
||||
#define UNINITIALIZED_VAR(x) x __attribute__((unused))
|
||||
#elif defined(__GNUC__) && __GNUC__ >= 3
|
||||
#define UNINITIALIZED_VAR(x) x = x
|
||||
#else
|
||||
#define UNINITIALIZED_VAR(x) x
|
||||
#endif
|
||||
|
||||
typedef unsigned long rb_num_t;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue