deac/ruby-lxc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Avoid rb_std{in,out,err} name clash with rubinius

Browse source
This commit is contained in:
Andre Nathan 2016-01-04 11:22:21 -02:00
parent e18dc18d8d
commit b262a3f5ad
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/lxc/lxc.c
View file

@ -574,7 +574,7 @@ lxc_attach_parse_options(VALUE rb_opts)
lxc_attach_options_t *opts; lxc_attach_options_t *opts;
VALUE rb_attach_flags, rb_namespaces, rb_personality, rb_initial_cwd; VALUE rb_attach_flags, rb_namespaces, rb_personality, rb_initial_cwd;
VALUE rb_uid, rb_gid, rb_env_policy, rb_extra_env_vars, rb_extra_keep_env; VALUE rb_uid, rb_gid, rb_env_policy, rb_extra_env_vars, rb_extra_keep_env;
VALUE rb_stdin, rb_stdout, rb_stderr; VALUE rb_stdin_opt, rb_stdout_opt, rb_stderr_opt;
opts = malloc(sizeof(*opts)); opts = malloc(sizeof(*opts));
if (opts == NULL) if (opts == NULL)
@ -667,28 +667,28 @@ lxc_attach_parse_options(VALUE rb_opts)
goto err; goto err;
} }
} }
rb_stdin = rb_hash_aref(rb_opts, SYMBOL("stdin")); rb_stdin_opt = rb_hash_aref(rb_opts, SYMBOL("stdin"));
if (!NIL_P(rb_stdin)) { if (!NIL_P(rb_stdin_opt)) {
if (has_file_descriptor(rb_stdin)) { if (has_file_descriptor(rb_stdin_opt)) {
opts->stdin_fd = io_fileno(rb_stdin); opts->stdin_fd = io_fileno(rb_stdin_opt);
} else { } else {
error = "stdin object must have a file descriptor"; error = "stdin object must have a file descriptor";
goto err; goto err;
} }
} }
rb_stdout = rb_hash_aref(rb_opts, SYMBOL("stdout")); rb_stdout_opt = rb_hash_aref(rb_opts, SYMBOL("stdout"));
if (!NIL_P(rb_stdout)) { if (!NIL_P(rb_stdout_opt)) {
if (has_file_descriptor(rb_stdout)) { if (has_file_descriptor(rb_stdout_opt)) {
opts->stdout_fd = io_fileno(rb_stdout); opts->stdout_fd = io_fileno(rb_stdout_opt);
} else { } else {
error = "stdout object must have a file descriptor"; error = "stdout object must have a file descriptor";
goto err; goto err;
} }
} }
rb_stderr = rb_hash_aref(rb_opts, SYMBOL("stderr")); rb_stderr_opt = rb_hash_aref(rb_opts, SYMBOL("stderr"));
if (!NIL_P(rb_stderr)) { if (!NIL_P(rb_stderr_opt)) {
if (has_file_descriptor(rb_stderr)) { if (has_file_descriptor(rb_stderr_opt)) {
opts->stderr_fd = io_fileno(rb_stderr); opts->stderr_fd = io_fileno(rb_stderr_opt);
} else { } else {
error = "stderr object must have a file descriptor"; error = "stderr object must have a file descriptor";
goto err; goto err;