Skip to content

Commit 001cb04

Browse files
AdamGSMaxxen
authored andcommitted
make duckdb_entrypoint macro more hygenic
1 parent a4d64a1 commit 001cb04

File tree

2 files changed

+3
-3
lines changed
  • crates

2 files changed

+3
-3
lines changed

crates/duckdb-loadable-macros/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ pub fn duckdb_entrypoint(_attr: TokenStream, item: TokenStream) -> TokenStream {
143143
///
144144
/// Will be called by duckdb
145145
#[no_mangle]
146-
pub unsafe extern "C" fn #c_entrypoint(db: *mut c_void) {
146+
pub unsafe extern "C" fn #c_entrypoint(db: *mut std::ffi::c_void) {
147147
unsafe {
148148
let connection = Connection::open_from_raw(db.cast()).expect("can't open db connection");
149149
#prefixed_original_function(connection).expect("init failed");
@@ -154,7 +154,7 @@ pub fn duckdb_entrypoint(_attr: TokenStream, item: TokenStream) -> TokenStream {
154154
///
155155
/// Predefined function, don't need to change unless you are sure
156156
#[no_mangle]
157-
pub unsafe extern "C" fn #c_entrypoint_version() -> *const c_char {
157+
pub unsafe extern "C" fn #c_entrypoint_version() -> *const std::ffi::c_char {
158158
unsafe {
159159
ffi::duckdb_library_version()
160160
}

crates/duckdb/examples/hello-ext/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use duckdb_loadable_macros::duckdb_entrypoint;
1313
use libduckdb_sys as ffi;
1414
use std::{
1515
error::Error,
16-
ffi::{c_char, c_void, CString},
16+
ffi::CString,
1717
sync::atomic::{AtomicBool, Ordering},
1818
};
1919

0 commit comments

Comments
 (0)