From 0f8d37b5a30c43cd195f31c9ff7b136ec4cf3db1 Mon Sep 17 00:00:00 2001
From: Lukas Stadler <lukas.stadler@oracle.com>
Date: Fri, 4 Nov 2016 13:24:34 +0100
Subject: [PATCH] small fixes in native code
---
com.oracle.truffle.r.native/fficall/src/include/Defn.h | 2 +-
com.oracle.truffle.r.native/fficall/src/jni/rffiutils.c | 2 +-
.../fficall/src/variable_defs/variable_defs.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
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 d431e33c73..2b4d813d23 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 c083d5a781..381fd1bbd3 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 9ab6cb36a2..01f2643b7d 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;
--
GitLab