Skip to content

Commit

Permalink
Re-document
Browse files Browse the repository at this point in the history
  • Loading branch information
wch committed Jul 22, 2024
1 parent e77ac84 commit 21fbf9e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 13 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Imports:
LinkingTo: cpp11, AsioHeaders, later
BugReports: https://github.com/rstudio/websocket/issues
SystemRequirements: GNU make, OpenSSL >= 1.0.2
RoxygenNote: 7.1.2
RoxygenNote: 7.3.2
Suggests:
httpuv,
testthat,
Expand Down
1 change: 1 addition & 0 deletions cleanup
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh

rm -f src/Makevars configure.log autobrew
rm -Rf .deps
14 changes: 2 additions & 12 deletions src/cpp11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@


#include "cpp11/declarations.hpp"
#include <R_ext/Visibility.h>

// websocket.cpp
SEXP wsCreate(std::string uri, int loop_id, cpp11::environment robjPublic, cpp11::environment robjPrivate, cpp11::strings accessLogChannels, cpp11::strings errorLogChannels, int maxMessageSize);
Expand Down Expand Up @@ -75,17 +76,6 @@ extern "C" SEXP _websocket_wsUpdateLogChannels(SEXP wsc_xptr, SEXP accessOrError
}

extern "C" {
/* .Call calls */
extern SEXP _websocket_wsAddProtocols(SEXP, SEXP);
extern SEXP _websocket_wsAppendHeader(SEXP, SEXP, SEXP);
extern SEXP _websocket_wsClose(SEXP, SEXP, SEXP);
extern SEXP _websocket_wsConnect(SEXP);
extern SEXP _websocket_wsCreate(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
extern SEXP _websocket_wsProtocol(SEXP);
extern SEXP _websocket_wsSend(SEXP, SEXP);
extern SEXP _websocket_wsState(SEXP);
extern SEXP _websocket_wsUpdateLogChannels(SEXP, SEXP, SEXP, SEXP);

static const R_CallMethodDef CallEntries[] = {
{"_websocket_wsAddProtocols", (DL_FUNC) &_websocket_wsAddProtocols, 2},
{"_websocket_wsAppendHeader", (DL_FUNC) &_websocket_wsAppendHeader, 3},
Expand All @@ -100,7 +90,7 @@ static const R_CallMethodDef CallEntries[] = {
};
}

extern "C" void R_init_websocket(DllInfo* dll){
extern "C" attribute_visible void R_init_websocket(DllInfo* dll){
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
R_useDynamicSymbols(dll, FALSE);
R_forceSymbols(dll, TRUE);
Expand Down

0 comments on commit 21fbf9e

Please sign in to comment.