Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix deprecation warnings #58

Merged
merged 1 commit into from
Oct 20, 2022
Merged

fix: Fix deprecation warnings #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#include <R_ext/Visibility.h>
#define export attribute_visible extern

extern SEXP winch_init_library();
extern SEXP winch_trace_back();
extern SEXP winch_trace_back_default_method();
extern SEXP winch_call(SEXP function, SEXP env);
extern SEXP winch_stop(SEXP message);
SEXP winch_init_library(SEXP argv0, SEXP force);
SEXP winch_trace_back(SEXP method);
SEXP winch_trace_back_default_method(void);
SEXP winch_call(SEXP function, SEXP env);
SEXP winch_stop(SEXP message);

static const R_CallMethodDef CallEntries[] = {
{"winch_c_init_library", (DL_FUNC) &winch_init_library, 2},
Expand All @@ -23,7 +23,7 @@ static const R_CallMethodDef CallEntries[] = {
{NULL, NULL, 0}
};

extern SEXP init_backtrace(const char* argv0, int force);
SEXP init_backtrace(const char* argv0, int force);

export void R_init_winch(DllInfo *dll)
{
Expand Down
6 changes: 3 additions & 3 deletions src/trace_back.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#endif


extern SEXP winch_trace_back_unwind();
extern SEXP winch_trace_back_backtrace();
SEXP winch_trace_back_unwind(void);
SEXP winch_trace_back_backtrace(void);


SEXP winch_trace_back(SEXP method) {
Expand All @@ -29,7 +29,7 @@ SEXP winch_trace_back(SEXP method) {
}
}

SEXP winch_trace_back_default_method() {
SEXP winch_trace_back_default_method(void) {
#if defined(HAVE_LIBUNWIND)
return Rf_ScalarInteger(1);
#elif defined(HAVE_LIBBACKTRACE) && BACKTRACE_SUPPORTED
Expand Down
2 changes: 1 addition & 1 deletion src/trace_back_backtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ int cb_get_name_ip(void *data, uintptr_t pc,
return 0;
}

SEXP winch_trace_back_backtrace() {
SEXP winch_trace_back_backtrace(void) {
R_xlen_t size = 0;
backtrace_full(backtrace_state, 1, cb_increment_size, cb_error, &size);

Expand Down
2 changes: 1 addition & 1 deletion src/trace_back_unwind.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ SEXP winch_trace_back_unwind() {

#else // #ifdef HAVE_LIBUNWIND

SEXP winch_trace_back_unwind() {
SEXP winch_trace_back_unwind(void) {
Rf_error("libunwind not supported on this platform.");
}

Expand Down