kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix compile error at r66280

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-12-08 03:32:39 +00:00
parent 7aea1e657d
commit 0b343021da
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mjit.c
View file

@ -423,6 +423,7 @@ init_header_filename(void)
} }
else else
#endif #endif
#ifndef _MSC_VER
{ {
/* A name of the header file included in any C file generated by MJIT for iseqs. */ /* A name of the header file included in any C file generated by MJIT for iseqs. */
static const char header_name[] = MJIT_HEADER_INSTALL_DIR "/" MJIT_MIN_HEADER_NAME; static const char header_name[] = MJIT_HEADER_INSTALL_DIR "/" MJIT_MIN_HEADER_NAME;
@ -431,9 +432,7 @@ init_header_filename(void)
header_file = xmalloc(baselen + header_name_len + 1); header_file = xmalloc(baselen + header_name_len + 1);
p = append_str2(header_file, basedir, baselen); p = append_str2(header_file, basedir, baselen);
p = append_str2(p, header_name, header_name_len + 1); p = append_str2(p, header_name, header_name_len + 1);
}
#ifndef _MSC_VER
{
if ((fd = rb_cloexec_open(header_file, O_RDONLY, 0)) < 0) { if ((fd = rb_cloexec_open(header_file, O_RDONLY, 0)) < 0) {
verbose(1, "Cannot access header file: %s", header_file); verbose(1, "Cannot access header file: %s", header_file);
xfree(header_file); xfree(header_file);
@ -451,7 +450,7 @@ init_header_filename(void)
} }
#else #else
{ {
static const char pch_name[] = MJIT_PRECOMPILED_HEADER_NAME; static const char pch_name[] = MJIT_HEADER_INSTALL_DIR "/" MJIT_PRECOMPILED_HEADER_NAME;
const size_t pch_name_len = sizeof(pch_name) - 1; const size_t pch_name_len = sizeof(pch_name) - 1;
pch_file = xmalloc(baselen + pch_name_len + 1); pch_file = xmalloc(baselen + pch_name_len + 1);

4
win32/Makefile.sub
View file

@ -1381,7 +1381,9 @@ mjit_config.h:
#define RUBY_MJIT_CONFIG_H 1 #define RUBY_MJIT_CONFIG_H 1
#define MJIT_CONFIG_ESCAPED_EQ "=" #define MJIT_CONFIG_ESCAPED_EQ "="
#define MJIT_PRECOMPILED_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_PRECOMPILED_HEADER_NAME)" #define MJIT_HEADER_INSTALL_DIR "/$(MJIT_HEADER_INSTALL_DIR)"
#define MJIT_MIN_HEADER_NAME "$(MJIT_MIN_HEADER_NAME)"
#define MJIT_PRECOMPILED_HEADER_NAME "$(MJIT_PRECOMPILED_HEADER_NAME)"
<<KEEP <<KEEP
@ @
@(set sep=#define MJIT_CC_COMMON ) & \ @(set sep=#define MJIT_CC_COMMON ) & \