From d2e48a3f01d9ce2fa6fd860ad5bd2fee28e29e66 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 5 Nov 2015 01:15:45 +0000 Subject: [PATCH] tk: RARRAY_AREF * ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c (RARRAY_AREF): add fallback definition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/tk/tcltklib.c | 3 +++ ext/tk/tkutil/tkutil.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c index c99bcb5e3d..a91aaabb37 100644 --- a/ext/tk/tcltklib.c +++ b/ext/tk/tcltklib.c @@ -45,6 +45,9 @@ int rb_thread_check_trap_pending(void); #if !defined(RARRAY_CONST_PTR) #define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s) #endif +#if !defined(RARRAY_AREF) +#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i] +#endif #ifdef OBJ_UNTRUST #define RbTk_OBJ_UNTRUST(x) do {OBJ_TAINT(x); OBJ_UNTRUST(x);} while (0) diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c index f6f0af1cd7..1a3720523e 100644 --- a/ext/tk/tkutil/tkutil.c +++ b/ext/tk/tkutil/tkutil.c @@ -40,6 +40,9 @@ static int rb_thread_critical; /* dummy */ #if !defined(RARRAY_CONST_PTR) #define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s) #endif +#if !defined(RARRAY_AREF) +#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i] +#endif #if defined(HAVE_STRNDUP) && !defined(_GNU_SOURCE) extern char *strndup(const char* _ptr, size_t _len);