From e70ac873e96e84022211ab1670d89a53d3e208ae Mon Sep 17 00:00:00 2001
From: Mick Jordan <mick.jordan@oracle.com>
Date: Sun, 7 Jun 2015 10:51:59 -0700
Subject: [PATCH] C fixes
---
com.oracle.truffle.r.native/fficall/jni/src/alloc.c | 1 +
com.oracle.truffle.r.native/fficall/jni/src/rf_functions.c | 5 +++--
com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/alloc.c b/com.oracle.truffle.r.native/fficall/jni/src/alloc.c
index 26e4e14319..d974d45d9c 100644
--- a/com.oracle.truffle.r.native/fficall/jni/src/alloc.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/alloc.c
@@ -10,6 +10,7 @@
* All rights reserved.
*/
#include "rffiutils.h"
+#include <stdlib.h>
void init_alloc(JNIEnv *env) {
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/rf_functions.c b/com.oracle.truffle.r.native/fficall/jni/src/rf_functions.c
index b48dedce91..c1dc500ba8 100644
--- a/com.oracle.truffle.r.native/fficall/jni/src/rf_functions.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rf_functions.c
@@ -21,6 +21,7 @@
* questions.
*/
#include "rffiutils.h"
+#include <string.h>
// Most of the functions with a Rf_ prefix
// TODO Lots missing yet
@@ -151,12 +152,12 @@ SEXP Rf_install(const char *name) {
Rboolean Rf_isNull(SEXP s) {
JNIEnv *thisenv = getEnv();
- return (*thisenv)->CallStaticObjectMethod(thisenv, CallRFFIHelperClass, Rf_isNullMethodID, s);
+ return (*thisenv)->CallStaticIntMethod(thisenv, CallRFFIHelperClass, Rf_isNullMethodID, s);
}
Rboolean Rf_isString(SEXP s) {
JNIEnv *thisenv = getEnv();
- return (*thisenv)->CallStaticObjectMethod(thisenv, CallRFFIHelperClass, Rf_isStringMethodID, s);
+ return (*thisenv)->CallStaticIntMethod(thisenv, CallRFFIHelperClass, Rf_isStringMethodID, s);
}
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h b/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
index 9dfcd2cd8d..5044291545 100644
--- a/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
@@ -47,6 +47,8 @@ void init_typecoerce(JNIEnv *env);
void init_attrib(JNIEnv *env);
void init_misc(JNIEnv *env);
void init_vectoraccess(JNIEnv *env);
+void init_listaccess(JNIEnv *env);
+void init_utils(JNIEnv *env);
extern jclass RDataFactoryClass;
extern jclass CallRFFIHelperClass;
--
GitLab