From 5db193ef293ed934477767a290e639f221bec28d Mon Sep 17 00:00:00 2001
From: Adam Welc <adam.welc@oracle.com>
Date: Thu, 21 Jul 2016 18:21:37 +0200
Subject: [PATCH] Added a new opaque type to represent contexts.
---
com.oracle.truffle.r.native/fficall/src/jni/variables.c | 2 +-
com.oracle.truffle.r.native/include/ed_Rinternals | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/com.oracle.truffle.r.native/fficall/src/jni/variables.c b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
index 70a830a0fc..112b772298 100644
--- a/com.oracle.truffle.r.native/fficall/src/jni/variables.c
+++ b/com.oracle.truffle.r.native/fficall/src/jni/variables.c
@@ -59,7 +59,7 @@ SEXP FASTR_NamespaceRegistry() {
return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getNamespaceRegistryMethodID);
}
-SEXP FASTR_GlobalContext() {
+CTXT FASTR_GlobalContext() {
JNIEnv *env = getEnv();
return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getGlobalContextMethodID);
}
diff --git a/com.oracle.truffle.r.native/include/ed_Rinternals b/com.oracle.truffle.r.native/include/ed_Rinternals
index 9d9f7d806a..3e0d8dba21 100644
--- a/com.oracle.truffle.r.native/include/ed_Rinternals
+++ b/com.oracle.truffle.r.native/include/ed_Rinternals
@@ -12,6 +12,7 @@ a
i
#ifdef FASTR
typedef void *SEXP;
+typedef void *CTXT;
#else
.
+1
--
GitLab