diff options
| author | nagachika <nagachika@ruby-lang.org> | 2020-09-20 20:23:12 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2020-09-20 20:23:12 +0900 |
| commit | 1b39a995b559677bf4bf2d0ac3a1c924928a936f (patch) | |
| tree | 1888420892abec4a1baf7fa3b99f485dafa248f2 /include | |
| parent | eb8270d67596fff58e245ff4227dd35e67dbef5c (diff) | |
| download | ruby-1b39a995b559677bf4bf2d0ac3a1c924928a936f.tar.gz | |
Revert "statement experssion is a GCCism" to pass ICC CI.
This reverts commit a6b50f379d4b71acac73ac6b22cbe2d2c5b50b3f.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/ruby.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 9b7c9842f8..1ce73d5559 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1218,10 +1218,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); (void)((sval) = (type *)DATA_PTR(result)); #ifdef __GNUC__ -#define Data_Make_Struct(klass,type,mark,free,sval) RB_GNUC_EXTENSION_BLOCK(\ +#define Data_Make_Struct(klass,type,mark,free,sval) ({\ Data_Make_Struct0(data_struct_obj, klass, type, sizeof(type), mark, free, sval); \ - data_struct_obj \ -) + data_struct_obj; \ +}) #else #define Data_Make_Struct(klass,type,mark,free,sval) (\ rb_data_object_make((klass),(RUBY_DATA_FUNC)(mark),(RUBY_DATA_FUNC)(free),(void **)&(sval),sizeof(type)) \ @@ -1236,10 +1236,10 @@ void *rb_check_typeddata(VALUE, const rb_data_type_t *); (void)((sval) = (type *)DATA_PTR(result)); #ifdef __GNUC__ -#define TypedData_Make_Struct(klass, type, data_type, sval) RB_GNUC_EXTENSION_BLOCK(\ +#define TypedData_Make_Struct(klass, type, data_type, sval) ({\ TypedData_Make_Struct0(data_struct_obj, klass, type, sizeof(type), data_type, sval); \ - data_struct_obj \ -) + data_struct_obj; \ +}) #else #define TypedData_Make_Struct(klass, type, data_type, sval) (\ rb_data_typed_object_make((klass),(data_type),(void **)&(sval),sizeof(type)) \ |