[rkward] rkward/rbackend: Attempt to fix MSVC link problem

Thomas Friedrichsmeier null at kde.org
Sun Jun 16 10:54:49 BST 2019


Git commit 95ccb5e21c46bc6a4000b8fa516f0b16aabfc495 by Thomas Friedrichsmeier.
Committed on 16/06/2019 at 09:54.
Pushed by tfry into branch 'master'.

Attempt to fix MSVC link problem

M  +7    -4    rkward/rbackend/rkrbackend.cpp

https://commits.kde.org/rkward/95ccb5e21c46bc6a4000b8fa516f0b16aabfc495

diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 791335a3..d255a9b6 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -78,13 +78,16 @@ void* RKRBackend::default_global_context = 0;
 #ifdef Q_OS_WIN
 #	include <R_ext/RStartup.h>
 #	include <R_ext/Utils.h>
+#	include <R_ext/libextern.h>
 
 	structRstart RK_R_Params;
 
-	// why oh why isn't Rinterface.h available on Windows?
-	LibExtern void* R_GlobalContext;
-	LibExtern uintptr_t R_CStackLimit;
-	extern "C" void R_SaveGlobalEnvToFile(char*);
+	extern "C" {
+		// why oh why isn't Rinterface.h available on Windows?
+		LibExtern void* R_GlobalContext;
+		LibExtern uintptr_t R_CStackLimit;
+		LibExtern void R_SaveGlobalEnvToFile(char*);
+	}
 #else
 #	include <Rinterface.h>
 #endif



More information about the rkward-tracker mailing list