[education/rkward] rkward/rbackend: Adjust to hiding for R_checkActivityEx in R-devel (for R 4.5)
Thomas Friedrichsmeier
null at kde.org
Mon Jul 29 21:39:58 BST 2024
Git commit a9eded2a98c50f90ebef6dda6ec4c3674c7b826b by Thomas Friedrichsmeier.
Committed on 29/07/2024 at 13:01.
Pushed by tfry into branch 'master'.
Adjust to hiding for R_checkActivityEx in R-devel (for R 4.5)
M +1 -1 rkward/rbackend/rkrapi.h
M +1 -1 rkward/rbackend/rkreventloop.cpp
https://invent.kde.org/education/rkward/-/commit/a9eded2a98c50f90ebef6dda6ec4c3674c7b826b
diff --git a/rkward/rbackend/rkrapi.h b/rkward/rbackend/rkrapi.h
index 643ac8983..e72f817e2 100644
--- a/rkward/rbackend/rkrapi.h
+++ b/rkward/rbackend/rkrapi.h
@@ -323,7 +323,7 @@ IMPORT_R_API(ptr_R_WriteConsoleEx);
IMPORT_R_API(R_InputHandlers);
IMPORT_R_API(R_PolledEvents);
-IMPORT_R_API(R_checkActivityEx);
+IMPORT_R_API(R_checkActivity);
IMPORT_R_API(R_runHandlers);
IMPORT_R_API(addInputHandler);
diff --git a/rkward/rbackend/rkreventloop.cpp b/rkward/rbackend/rkreventloop.cpp
index 8671cc725..19a510479 100644
--- a/rkward/rbackend/rkreventloop.cpp
+++ b/rkward/rbackend/rkreventloop.cpp
@@ -19,7 +19,7 @@ static void processX11EventsWorker (void *) {
#ifndef Q_OS_WIN
for (;;) {
fd_set *what;
- what = RFn::R_checkActivityEx(ROb(R_wait_usec) > 0 ? ROb(R_wait_usec) : 50, 1, RK_doIntr);
+ what = RFn::R_checkActivity(ROb(R_wait_usec) > 0 ? ROb(R_wait_usec) : 50, 1);
RFn::R_runHandlers(ROb(R_InputHandlers), what);
if (!what) break;
}
More information about the rkward-tracker
mailing list