Skip to content
Snippets Groups Projects
Commit 4bdcec66 authored by Mick Jordan's avatar Mick Jordan
Browse files

revert R_Interactive to global variable

parent 534a2475
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,7 @@
#include <sys/utsname.h>
#include <rffiutils.h>
#include <R_ext/RStartup.h>
#include <Rinterface.h>
static JavaVM *javaVM;
......@@ -25,6 +26,9 @@ static jclass rStartParamsClass;
int R_running_as_main_program;
int R_SignalHandlers;
FILE * R_Consolefile;
FILE * R_Outputfile;
typedef jint (JNICALL *JNI_CreateJavaVMFunc)
(JavaVM **pvm, void **penv, void *args);
......@@ -190,7 +194,7 @@ void R_set_command_line_arguments(int argc, char **argv) {
int Rf_initEmbeddedR(int argc, char *argv[]) {
Rf_initialize_R(argc, argv);
// R_Interactive = TRUE;
R_Interactive = TRUE;
setup_Rmainloop();
return 1;
}
......
......@@ -58,12 +58,6 @@ SEXP FASTR_NamespaceRegistry() {
return (*env)->CallStaticObjectMethod(env, CallRFFIHelperClass, getNamespaceRegistryMethodID);
}
Rboolean FASTR_IsInteractive() {
JNIEnv *env = getEnv();
return (*env)->CallStaticIntMethod(env, CallRFFIHelperClass, isInteractiveMethodID);
}
void init_variables(JNIEnv *env, jobjectArray initialValues) {
// initialValues is an array of enums
jclass enumClass = (*env)->GetObjectClass(env, (*env)->GetObjectArrayElement(env, initialValues, 0));
......
......@@ -37,7 +37,7 @@ R_EXT_HEADERS_TO_LINK := $(filter-out $(notdir $(R_EXT_HEADERS_LOCAL)),$(R_EXT_H
R_HEADERS := $(wildcard $(GNUR_HOME)/include/*.h)
R_HEADERS_FILENAMES := $(notdir $(R_HEADERS))
#$(info R_HEADERS_FILENAMES=$(R_HEADERS_FILENAMES))
R_HEADERS_LOCAL := src/libintl.h src/Rinternals.h src/Rinterface.h
R_HEADERS_LOCAL := src/libintl.h src/Rinternals.h # src/Rinterface.h
#$(info R_HEADERS_LOCAL=$(R_HEADERS_LOCAL))>
R_HEADERS_TO_LINK := $(filter-out $(notdir $(R_HEADERS_LOCAL)),$(R_HEADERS_FILENAMES))
#$(info R_HEADERS_TO_LINK=$(R_HEADERS_TO_LINK))
......@@ -49,7 +49,7 @@ linked: ed_Rinternals ed_Rinterface ed_GraphicsEngine
$(foreach file,$(R_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/$(file) $(file);)
ln -sf src/libintl.h
ed $(GNUR_HOME)/include/Rinternals.h < ed_Rinternals
ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface
# ed $(GNUR_HOME)/include/Rinterface.h < ed_Rinterface
ed $(GNUR_HOME)/include/R_ext/GraphicsEngine.h < ed_GraphicsEngine
$(foreach file,$(R_EXT_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/R_ext/$(file) R_ext/$(file);)
# cp $(R_EXT_HEADERS_LOCAL) R_ext
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment