diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-24 16:23:15 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-24 16:23:15 +0000 |
commit | 0fe7df5c2f94550a9505176c4e3ec48d2a394a3a (patch) | |
tree | 96c822dbff21d5fd17a6f1be202b52af27e0aac2 | |
parent | 1a0261296361397650c5665869a782a0f6b8b8e8 (diff) |
* oniguruma.h (OnigWarnFunc): add a variadic argument.
[ruby-core:4751]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | oniguruma.h | 4 | ||||
-rw-r--r-- | regparse.c | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Apr 25 01:18:43 2005 Tanaka Akira <akr@m17n.org> + + * oniguruma.h (OnigWarnFunc): add a variadic argument. + [ruby-core:4751] + Sat Apr 23 19:49:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/tk/tcltklib.c (ip_RubyExitCommand): exit with status code diff --git a/oniguruma.h b/oniguruma.h index ef448cc698..95dfbebc5f 100644 --- a/oniguruma.h +++ b/oniguruma.h @@ -704,8 +704,8 @@ typedef struct { int upper; } OnigRepeatRange; -typedef void (*OnigWarnFunc) P_((const char* s)); -extern void onig_null_warn P_((const char* s)); +typedef void (*OnigWarnFunc) P_((const char* s, ...)); +extern void onig_null_warn P_((const char* s, ...)); #define ONIG_NULL_WARN onig_null_warn #define ONIG_CHAR_TABLE_SIZE 256 diff --git a/regparse.c b/regparse.c index 04a0ccea5b..0d8f5bc0bb 100644 --- a/regparse.c +++ b/regparse.c @@ -58,7 +58,7 @@ OnigSyntaxType OnigSyntaxRuby = { OnigSyntaxType* OnigDefaultSyntax = ONIG_SYNTAX_RUBY; -extern void onig_null_warn(const char* s) { } +extern void onig_null_warn(const char* s, ...) { } #ifdef DEFAULT_WARN_FUNCTION static OnigWarnFunc onig_warn = (OnigWarnFunc )DEFAULT_WARN_FUNCTION; |