diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/readline/readline.c | 4 | ||||
| -rw-r--r-- | ext/ripper/eventids2.c | 4 | ||||
| -rw-r--r-- | ext/tk/tcltklib.c | 4 | ||||
| -rw-r--r-- | ext/tk/tkutil/tkutil.c | 3 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 4a28b6e11c..626c0e0dc7 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -1,6 +1,10 @@ /* readline.c -- GNU Readline module Copyright (C) 1997-2001 Shugo Maeda */ +#ifdef RUBY_EXTCONF_H +#include RUBY_EXTCONF_H +#endif + #include <errno.h> #include <stdio.h> #include <ctype.h> diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c index 18d803873c..ba9c90269a 100644 --- a/ext/ripper/eventids2.c +++ b/ext/ripper/eventids2.c @@ -7,7 +7,6 @@ #define tHEREDOC_BEG (tLAST_TOKEN + 7) #define tHEREDOC_END (tLAST_TOKEN + 8) #define k__END__ (tLAST_TOKEN + 9) -#define tCHAR (tLAST_TOKEN + 10) static ID ripper_id_backref; static ID ripper_id_backtick; @@ -44,7 +43,6 @@ static ID ripper_id_regexp_beg; static ID ripper_id_regexp_end; static ID ripper_id_label; static ID ripper_id_tlambda; -static ID ripper_id_tlambda_arg; static ID ripper_id_tlambeg; static ID ripper_id_ignored_nl; @@ -98,7 +96,6 @@ ripper_init_eventids2(VALUE self) ripper_id_regexp_end = rb_intern("on_regexp_end"); ripper_id_label = rb_intern("on_label"); ripper_id_tlambda = rb_intern("on_tlambda"); - ripper_id_tlambda_arg = rb_intern("on_tlambda_arg"); ripper_id_tlambeg = rb_intern("on_tlambeg"); ripper_id_ignored_nl = rb_intern("on_ignored_nl"); @@ -248,7 +245,6 @@ static struct token_assoc { {tXSTRING_BEG, &ripper_id_backtick}, {tLABEL, &ripper_id_label}, {tLAMBDA, &ripper_id_tlambda}, - {tLAMBDA_ARG, &ripper_id_tlambda_arg}, {tLAMBEG, &ripper_id_tlambeg}, /* ripper specific tokens */ diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index 9a64c27870..e43b98e2c1 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -6217,11 +6217,7 @@ lib_fromUTF8_core(ip_obj, src, encodename) char *s; int len; -<<<<<<< tcltklib.c - StringValue(str); -======= StringValue(str); ->>>>>>> 1.45 s = Tcl_GetByteArrayFromObj(Tcl_NewStringObj(RSTRING(str)->ptr, RSTRING(str)->len), &len); diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index f4271a724c..7789d4071d 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -1234,7 +1234,8 @@ cbsubst_get_subst_arg(argc, argv, self) VALUE self; { struct cbsubst_info *inf; - char *str, *buf, *ptr; + const char *str; + char *buf, *ptr; int i, j, len; ID id; volatile VALUE arg_sym, ret; diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index ba4fc4b921..202b54f93e 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -2984,7 +2984,7 @@ static VALUE fole_missing(int argc, VALUE *argv, VALUE self) { ID id; - char* mname; + const char* mname; int n; id = rb_to_id(argv[0]); mname = rb_id2name(id); |