Skip to content

Commit 68fa503

Browse files
committed
use R_GetCCallable for execLaterNative
1 parent 28728cd commit 68fa503

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: nanonext
22
Type: Package
33
Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
4-
Version: 0.13.6.9013
4+
Version: 0.13.6.9014
55
Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
66
a socket library implementing 'Scalability Protocols', a reliable,
77
high-performance standard for common communications patterns including

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nanonext 0.13.6.9013 (development)
1+
# nanonext 0.13.6.9014 (development)
22

33
#### New Features
44

src/init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ SEXP nano_success;
5252
SEXP nano_unresolved;
5353

5454
SEXP nano_precious;
55+
later_fun later2;
5556

5657
static void RegisterSymbols(void) {
5758
nano_AioSymbol = Rf_install("aio");
@@ -195,6 +196,7 @@ static const R_ExternalMethodDef externalMethods[] = {
195196
void attribute_visible R_init_nanonext(DllInfo* dll) {
196197
RegisterSymbols();
197198
PreserveObjects();
199+
later2 = (later_fun) R_GetCCallable("later", "execLaterNative");
198200
R_registerRoutines(dll, NULL, callMethods, NULL, externalMethods);
199201
R_useDynamicSymbols(dll, FALSE);
200202
R_forceSymbols(dll, TRUE);

src/later_shim.cpp

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/nanonext.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ typedef struct nano_buf_s {
176176
size_t cur;
177177
} nano_buf;
178178

179-
void later2(void (*func)(void *), void *data, double secs);
179+
typedef void (*later_fun)(void (*func)(void *), void *data, double secs);
180+
extern later_fun later2;
180181

181182
SEXP nano_PreserveObject(SEXP);
182183
void nano_ReleaseObject(SEXP);

0 commit comments

Comments
 (0)