summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-15 14:20:27 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-15 14:20:27 +0000
commitcef1f23e899a9ac36bb5e470b389e5d289f6cb0b (patch)
treed9ef5cfc339d898d80c753fc53abc229ada747d5
parentabfc03c6cf1e1018fa471f180a4381599efe695b (diff)
* gc.c: Delete excess semicolon after RUBY_ALIAS_FUNCTION().
Suppress "syntax error: empty declaration" warnings by Oracle Solaris Studio 12.x on Solaris. [Bug #11821] * hash.c: ditto, after NOINSERT_UPDATE_CALLBACK(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--gc.c4
-rw-r--r--hash.c10
3 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a351615..72fc471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Dec 15 23:13:10 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * gc.c: Delete excess semicolon after RUBY_ALIAS_FUNCTION().
+ Suppress "syntax error: empty declaration" warnings by
+ Oracle Solaris Studio 12.x on Solaris. [Bug #11821]
+
+ * hash.c: ditto, after NOINSERT_UPDATE_CALLBACK().
+
Tue Dec 15 18:04:04 2015 Martin Duerst <duerst@it.aoyama.ac.jp>
* NEWS: added news about EBCDIC encoding
diff --git a/gc.c b/gc.c
index cc86a72..12be1ea 100644
--- a/gc.c
+++ b/gc.c
@@ -1919,7 +1919,7 @@ rb_data_object_wrap(VALUE klass, void *datap, RUBY_DATA_FUNC dmark, RUBY_DATA_FU
#undef rb_data_object_alloc
RUBY_ALIAS_FUNCTION(rb_data_object_alloc(VALUE klass, void *datap,
RUBY_DATA_FUNC dmark, RUBY_DATA_FUNC dfree),
- rb_data_object_wrap, (klass, datap, dmark, dfree));
+ rb_data_object_wrap, (klass, datap, dmark, dfree))
VALUE
@@ -1940,7 +1940,7 @@ rb_data_typed_object_wrap(VALUE klass, void *datap, const rb_data_type_t *type)
#undef rb_data_typed_object_alloc
RUBY_ALIAS_FUNCTION(rb_data_typed_object_alloc(VALUE klass, void *datap,
const rb_data_type_t *type),
- rb_data_typed_object_wrap, (klass, datap, type));
+ rb_data_typed_object_wrap, (klass, datap, type))
VALUE
rb_data_typed_object_zalloc(VALUE klass, size_t size, const rb_data_type_t *type)
diff --git a/hash.c b/hash.c
index 927fcf7..b06d651 100644
--- a/hash.c
+++ b/hash.c
@@ -1491,8 +1491,8 @@ hash_aset_str(st_data_t *key, st_data_t *val, struct update_arg *arg, int existi
return hash_aset(key, val, arg, existing);
}
-NOINSERT_UPDATE_CALLBACK(hash_aset);
-NOINSERT_UPDATE_CALLBACK(hash_aset_str);
+NOINSERT_UPDATE_CALLBACK(hash_aset)
+NOINSERT_UPDATE_CALLBACK(hash_aset_str)
/*
* call-seq:
@@ -2247,7 +2247,7 @@ rb_hash_update_callback(st_data_t *key, st_data_t *value, struct update_arg *arg
return ST_CONTINUE;
}
-NOINSERT_UPDATE_CALLBACK(rb_hash_update_callback);
+NOINSERT_UPDATE_CALLBACK(rb_hash_update_callback)
static int
rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
@@ -2274,7 +2274,7 @@ rb_hash_update_block_callback(st_data_t *key, st_data_t *value, struct update_ar
return ST_CONTINUE;
}
-NOINSERT_UPDATE_CALLBACK(rb_hash_update_block_callback);
+NOINSERT_UPDATE_CALLBACK(rb_hash_update_block_callback)
static int
rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
@@ -2345,7 +2345,7 @@ rb_hash_update_func_callback(st_data_t *key, st_data_t *value, struct update_arg
return ST_CONTINUE;
}
-NOINSERT_UPDATE_CALLBACK(rb_hash_update_func_callback);
+NOINSERT_UPDATE_CALLBACK(rb_hash_update_func_callback)
static int
rb_hash_update_func_i(VALUE key, VALUE value, VALUE arg0)