kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Get rid of redefinition of rb_execution_context_t

Browse source 
Regardless of the order to include "vm_core.h" and "builtin.h".
This commit is contained in:
Nobuyoshi Nakada 2020-03-19 13:25:53 +09:00
parent eeb178dc1f
commit b6833ff50d
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builtin.h
View file

@ -22,8 +22,9 @@ struct rb_builtin_function {
void rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table); void rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table);
#ifndef VM_CORE_H_EC_DEFINED #ifndef rb_execution_context_t
typedef struct rb_execution_context_struct rb_execution_context_t; typedef struct rb_execution_context_struct rb_execution_context_t;
#define rb_execution_context_t rb_execution_context_t
#endif #endif
/* The following code is generated by the following Ruby script: /* The following code is generated by the following Ruby script:

9
vm_core.h
View file

@ -827,7 +827,7 @@ typedef char rb_thread_id_string_t[sizeof(rb_nativethread_id_t) * 2 + 3];
typedef struct rb_fiber_struct rb_fiber_t; typedef struct rb_fiber_struct rb_fiber_t;
typedef struct rb_execution_context_struct { struct rb_execution_context_struct {
/* execution information */ /* execution information */
VALUE *vm_stack; /* must free, must mark */ VALUE *vm_stack; /* must free, must mark */
size_t vm_stack_size; /* size in word (byte size / sizeof(VALUE)) */ size_t vm_stack_size; /* size in word (byte size / sizeof(VALUE)) */
@ -876,7 +876,12 @@ typedef struct rb_execution_context_struct {
size_t stack_maxsize; size_t stack_maxsize;
RUBY_ALIGNAS(SIZEOF_VALUE) jmp_buf regs; RUBY_ALIGNAS(SIZEOF_VALUE) jmp_buf regs;
} machine; } machine;
} rb_execution_context_t; };
#ifndef rb_execution_context_t
typedef struct rb_execution_context_struct rb_execution_context_t;
#define rb_execution_context_t rb_execution_context_t
#endif
// for builtin.h // for builtin.h
#define VM_CORE_H_EC_DEFINED 1 #define VM_CORE_H_EC_DEFINED 1