native refactor step 2

060fec26 · Mick Jordan · 98d82e33 · 060fec26 · 060fec26 · 060fec26
Commit 060fec26 authored 9 years ago by Mick Jordan
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_devices.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_devices.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_engine.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_engine.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_format.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_format.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_graphics.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_graphics.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_plot.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_plot.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_plot3d.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_plot3d.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_plotmath.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_plotmath.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_print.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_print.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_rlocale.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_rlocale.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/main_sort.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_sort.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/rfficall.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rfficall.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
--- a/com.oracle.truffle.r.native/fficall/jni/src/sys.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/sys.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/unimplemented.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/unimplemented.c
--- a/com.oracle.truffle.r.native/fficall/jni/src/variables.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/variables.c
@@ -29,7 +29,7 @@
 #include <jni.h>
 #include <Rinternals.h>
 #include "rffiutils.h"
-#include "../../common/src/variable_defs.h"
+#include "../common/variable_defs.h"

 jmethodID getGlobalEnvMethodID;
 jmethodID getBaseEnvMethodID;