Skip to content

Commit 39fcf33

Browse files
committed
merge revision(s) r45715: [Backport ruby#10265]
* configure.in: NetBSD's ksh, used by configure, needs escapes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent a50794d commit 39fcf33

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Wed Oct 15 23:25:24 2014 NARUSE, Yui <[email protected]>
2+
3+
* configure.in: NetBSD's ksh, used by configure, needs escapes.
4+
15
Wed Oct 15 23:13:43 2014 Eric Wong <[email protected]>
26

37
* array.c (ary_recycle_hash): add RB_GC_GUARD

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2092,7 +2092,7 @@ if test x$setjmp_prefix = xsig; then
20922092
else
20932093
unset setjmp_sigmask
20942094
fi
2095-
AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+($setjmp_cast)})
2095+
AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
20962096
AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
20972097
AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
20982098
AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)

version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.4"
22
#define RUBY_RELEASE_DATE "2014-10-15"
3-
#define RUBY_PATCHLEVEL 252
3+
#define RUBY_PATCHLEVEL 253
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 10

0 commit comments

Comments
 (0)