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

Add missing pub structs exposed in lib.rs #30

Merged
merged 5 commits into from
Aug 9, 2024
+519 −177
Merged

Add missing pub structs exposed in lib.rs #30

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b14f9ad
Add missing pub structs exposed in lib.rs
touilleMan Aug 6, 2024
f504380
Fix incorrect cfg! target_arch for x86
touilleMan Aug 7, 2024
e73325a
Fix clippy smells
touilleMan Aug 7, 2024
12eeff0
Allow compilation of `winfsp_wrs_sys` on non-Windows platforms
touilleMan Aug 7, 2024
3ed8240
Rework FileSystemContext
touilleMan Aug 7, 2024
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
Prev Previous commit
Next Next commit
Fix incorrect cfg! target_arch for x86
@touilleMan
touilleMan committed Aug 7, 2024

Verified

This commit was signed with the committer’s verified signature.
yanghang8612 Asuka
GPG key ID: 515754A8894D14AE
Verified
Learn about vigilant mode
commit f5043809236b94ea69472727293317cadb3c6d3f
2 changes: 1 addition & 1 deletion winfsp_wrs/src/init.rs
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ fn get_lplibfilename() -> Result<U16CString, InitError> {

if cfg!(target_arch = "x86_64") {
path.push("winfsp-x64.dll");
} else if cfg!(target_arch = "i686") {
} else if cfg!(target_arch = "x86") {
path.push("winfsp-x86.dll");
} else if cfg!(target_arch = "aarch64") {
path.push("winfsp-a64.dll")
2 changes: 1 addition & 1 deletion winfsp_wrs_build/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ pub fn build() {
if cfg!(target_arch = "x86_64") {
println!("cargo:rustc-link-lib=dylib=delayimp");
println!("cargo:rustc-link-arg=/DELAYLOAD:winfsp-x64.dll");
} else if cfg!(target_arch = "i686") {
} else if cfg!(target_arch = "x86") {
println!("cargo:rustc-link-lib=dylib=delayimp");
println!("cargo:rustc-link-arg=/DELAYLOAD:winfsp-x86.dll");
} else if cfg!(target_arch = "aarch64") {
2 changes: 1 addition & 1 deletion winfsp_wrs_sys/build.rs
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ fn main() {
if cfg!(all(target_os = "windows", target_env = "msvc")) {
if cfg!(target_arch = "x86_64") {
println!("cargo:rustc-link-lib=dylib=winfsp-x64");
} else if cfg!(target_arch = "i686") {
} else if cfg!(target_arch = "x86") {
println!("cargo:rustc-link-lib=dylib=winfsp-x86");
} else if cfg!(target_arch = "aarch64") {
println!("cargo:rustc-link-lib=dylib=winfsp-a64");