nixpkgs/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
2015-05-05 13:05:54 +02:00

43 lines
1.3 KiB
Plaintext

diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h
index 8f4752c..6d0e9a2 100644
--- a/src/backends/R/rserver/rcallbacks.h
+++ b/src/backends/R/rserver/rcallbacks.h
@@ -30,7 +30,6 @@ class Expression;
#include <Rversion.h>
#include <Rdefines.h>
#define R_INTERFACE_PTRS
-#include <Rinterface.h>
#include <R_ext/Parse.h>
//This File implements the necessary callbacks for R
commit 846cf02ab1618b9322b83eafc18dff3264988b72
Author: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Mon Apr 27 16:08:51 2015 +0200
Also build against R >= 3.2.
diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp
index 2c86531..492f270 100644
--- a/src/backends/R/rserver/rcallbacks.cpp
+++ b/src/backends/R/rserver/rcallbacks.cpp
@@ -26,6 +26,7 @@
#include <QStringList>
#include <stdio.h>
+#include <Rinterface.h>
RServer* server;
Expression* currentExpression;
diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
index 30cdb70..f689f42 100644
--- a/src/backends/R/rserver/rserver.cpp
+++ b/src/backends/R/rserver/rserver.cpp
@@ -42,7 +42,6 @@
#include <Rversion.h>
#include <Rdefines.h>
#define R_INTERFACE_PTRS
-#include <Rinterface.h>
#include <R_ext/Parse.h>
// Not making a member to prevent pulling R headers into rserver.h