Merge

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) {
 

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);
 
 }
 

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;