ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-26 19:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to bindgen 0.58 (#933)

Browse Source
This commit is contained in:
gwenn 2021-04-05 17:35:23 +02:00 committed by GitHub
parent 6c956bb270
commit ddf69f749a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsqlite3-sys/Cargo.toml
View File

@ -37,7 +37,7 @@ wasm32-wasi-vfs = []
winsqlite3 = ["min_sqlite_version_3_7_16"] winsqlite3 = ["min_sqlite_version_3_7_16"]
[build-dependencies] [build-dependencies]
bindgen = { version = "0.57", optional = true, default-features = false, features = ["runtime"] } bindgen = { version = "0.58", optional = true, default-features = false, features = ["runtime"] }
pkg-config = { version = "0.3", optional = true } pkg-config = { version = "0.3", optional = true }
cc = { version = "1.0", optional = true } cc = { version = "1.0", optional = true }

68
libsqlite3-sys/build.rs
View File

@ -393,32 +393,32 @@ mod bindings {
if cfg!(all(windows, feature = "winsqlite3")) { if cfg!(all(windows, feature = "winsqlite3")) {
bindings = bindings bindings = bindings
.clang_arg("-DBINDGEN_USE_WINSQLITE3") .clang_arg("-DBINDGEN_USE_WINSQLITE3")
.blacklist_item("NTDDI_.+") .blocklist_item("NTDDI_.+")
.blacklist_item("WINAPI_FAMILY.*") .blocklist_item("WINAPI_FAMILY.*")
.blacklist_item("_WIN32_.+") .blocklist_item("_WIN32_.+")
.blacklist_item("_VCRT_COMPILER_PREPROCESSOR") .blocklist_item("_VCRT_COMPILER_PREPROCESSOR")
.blacklist_item("_SAL_VERSION") .blocklist_item("_SAL_VERSION")
.blacklist_item("__SAL_H_VERSION") .blocklist_item("__SAL_H_VERSION")
.blacklist_item("_USE_DECLSPECS_FOR_SAL") .blocklist_item("_USE_DECLSPECS_FOR_SAL")
.blacklist_item("_USE_ATTRIBUTES_FOR_SAL") .blocklist_item("_USE_ATTRIBUTES_FOR_SAL")
.blacklist_item("_CRT_PACKING") .blocklist_item("_CRT_PACKING")
.blacklist_item("_HAS_EXCEPTIONS") .blocklist_item("_HAS_EXCEPTIONS")
.blacklist_item("_STL_LANG") .blocklist_item("_STL_LANG")
.blacklist_item("_HAS_CXX17") .blocklist_item("_HAS_CXX17")
.blacklist_item("_HAS_CXX20") .blocklist_item("_HAS_CXX20")
.blacklist_item("_HAS_NODISCARD") .blocklist_item("_HAS_NODISCARD")
.blacklist_item("WDK_NTDDI_VERSION") .blocklist_item("WDK_NTDDI_VERSION")
.blacklist_item("OSVERSION_MASK") .blocklist_item("OSVERSION_MASK")
.blacklist_item("SPVERSION_MASK") .blocklist_item("SPVERSION_MASK")
.blacklist_item("SUBVERSION_MASK") .blocklist_item("SUBVERSION_MASK")
.blacklist_item("WINVER") .blocklist_item("WINVER")
.blacklist_item("__security_cookie") .blocklist_item("__security_cookie")
.blacklist_type("size_t") .blocklist_type("size_t")
.blacklist_type("__vcrt_bool") .blocklist_type("__vcrt_bool")
.blacklist_type("wchar_t") .blocklist_type("wchar_t")
.blacklist_function("__security_init_cookie") .blocklist_function("__security_init_cookie")
.blacklist_function("__report_gsfailure") .blocklist_function("__report_gsfailure")
.blacklist_function("__va_start"); .blocklist_function("__va_start");
} }
// When cross compiling unless effort is taken to fix the issue, bindgen // When cross compiling unless effort is taken to fix the issue, bindgen
@ -440,14 +440,14 @@ mod bindings {
if generating_bundled_bindings() || is_cross_compiling { if generating_bundled_bindings() || is_cross_compiling {
// Get rid of va_list, as it's not // Get rid of va_list, as it's not
bindings = bindings bindings = bindings
.blacklist_function("sqlite3_vmprintf") .blocklist_function("sqlite3_vmprintf")
.blacklist_function("sqlite3_vsnprintf") .blocklist_function("sqlite3_vsnprintf")
.blacklist_function("sqlite3_str_vappendf") .blocklist_function("sqlite3_str_vappendf")
.blacklist_type("va_list") .blocklist_type("va_list")
.blacklist_type("__builtin_va_list") .blocklist_type("__builtin_va_list")
.blacklist_type("__gnuc_va_list") .blocklist_type("__gnuc_va_list")
.blacklist_type("__va_list_tag") .blocklist_type("__va_list_tag")
.blacklist_item("__GNUC_VA_LIST"); .blocklist_item("__GNUC_VA_LIST");
} }
bindings bindings