ruby-changes:49210
From: ngoto <ko1@a...>
Date: Tue, 19 Dec 2017 00:47:04 +0900 (JST)
Subject: [ruby-changes:49210] ngoto:r61324 (trunk): eval_error.c: Fix compile error on Solaris 10
ngoto 2017-12-19 00:46:56 +0900 (Tue, 19 Dec 2017) New Revision: 61324 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61324 Log: eval_error.c: Fix compile error on Solaris 10 * eval_error.c (write_warn, write_warn2, write_warn_str): Fix compile error "operands have incompatible types" with Oracle Solaris Studio 12.4 on Solaris 10. Modified files: trunk/eval_error.c Index: eval_error.c =================================================================== --- eval_error.c (revision 61323) +++ eval_error.c (revision 61324) @@ -6,7 +6,7 @@ https://github.com/ruby/ruby/blob/trunk/eval_error.c#L6 #ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P #define write_warn(str, x) RB_GNUC_EXTENSION_BLOCK( \ NIL_P(str) ? \ - warn_print(x) : ( \ + warn_print(x) : (void)( \ (__builtin_constant_p(x)) ? \ rb_str_concat((str), rb_str_new((x), (long)strlen(x))) : \ rb_str_concat((str), rb_str_new2(x)) \ @@ -18,14 +18,14 @@ https://github.com/ruby/ruby/blob/trunk/eval_error.c#L18 rb_write_error(x) \ ) #else -#define write_warn(str, x) NIL_P(str) ? rb_write_error((x)) : rb_str_concat((str), rb_str_new2(x)) +#define write_warn(str, x) NIL_P(str) ? rb_write_error((x)) : (void)rb_str_concat((str), rb_str_new2(x)) #define warn_print(x) rb_write_error(x) #endif -#define write_warn2(str,x,l) NIL_P(str) ? warn_print2(x,l) : rb_str_concat((str), rb_str_new((x),(l))) +#define write_warn2(str,x,l) NIL_P(str) ? warn_print2(x,l) : (void)rb_str_concat((str), rb_str_new((x),(l))) #define warn_print2(x,l) rb_write_error2((x),(l)) -#define write_warn_str(str,x) NIL_P(str) ? rb_write_error_str(x) : rb_str_concat((str), (x)) +#define write_warn_str(str,x) NIL_P(str) ? rb_write_error_str(x) : (void)rb_str_concat((str), (x)) #define warn_print_str(x) rb_write_error_str(x) static VALUE error_pos_str(void); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/