diff --git a/com.oracle.truffle.r.native/fficall/src/include/Defn.h b/com.oracle.truffle.r.native/fficall/src/include/Defn.h index d431e33c736142a2c2e51e16815c95a9593e528f..2b4d813d23ac84d29dd8e6990d3c4f440ddc9e07 100644 --- a/com.oracle.truffle.r.native/fficall/src/include/Defn.h +++ b/com.oracle.truffle.r.native/fficall/src/include/Defn.h @@ -61,7 +61,7 @@ extern Rboolean mbcslocale; extern Rboolean latin1locale; #define INI_as(v) -extern char OutDec INI_as('.'); +extern char* OutDec INI_as("."); extern Rboolean known_to_be_latin1 INI_as(FALSE); extern Rboolean known_to_be_utf8 INI_as(FALSE); diff --git a/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c b/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c index c083d5a7811e31bc3d106fb65b55defeb8c4a6c8..381fd1bbd330935ecbb9c4beace5183490c43502 100644 --- a/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c +++ b/com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c @@ -384,7 +384,7 @@ SEXP addGlobalRef(JNIEnv *env, SEXP obj, int permanent) { SEXP checkRef(JNIEnv *env, SEXP obj) { SEXP gref = findCachedGlobalRef(env, obj); - TRACE(TARGpp, obj, global); + TRACE(TARGpp, obj, gref); if (gref == NULL) { return obj; } else { diff --git a/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h b/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h index 9ab6cb36a2dd04d30fd90242b6955138ab369ccf..01f2643b7dd05d124e0cfd40815233163a5ee0d1 100644 --- a/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h +++ b/com.oracle.truffle.r.native/fficall/src/variable_defs/variable_defs.h @@ -89,7 +89,7 @@ Rboolean R_interrupts_suspended; int R_interrupts_pending; Rboolean mbcslocale; Rboolean useaqua; -char OutDec = '.'; +char* OutDec = "."; Rboolean utf8locale = FALSE; Rboolean mbcslocale = FALSE; Rboolean latin1locale = FALSE;