From b94fce25cfe4788836f5611a3b78d62cf93e94b6 Mon Sep 17 00:00:00 2001 From: Justin W Smith <103147162+justsmth@users.noreply.github.com> Date: Thu, 18 Jan 2024 20:50:49 -0500 Subject: [PATCH] Cleanup --- aws-lc-fips-sys/builder/cmake_builder.rs | 1 - aws-lc-sys/include/rust_wrapper.h | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/aws-lc-fips-sys/builder/cmake_builder.rs b/aws-lc-fips-sys/builder/cmake_builder.rs index 74a6d2916c0..f2b58726f44 100644 --- a/aws-lc-fips-sys/builder/cmake_builder.rs +++ b/aws-lc-fips-sys/builder/cmake_builder.rs @@ -106,7 +106,6 @@ impl CmakeBuilder { .map_err(|x| panic!("{}", x)) .unwrap(); for (key, value) in env_map { - println!("ENV-{}={}", key.as_str(), value.as_str()); cmake_cfg.env(key, value); } } diff --git a/aws-lc-sys/include/rust_wrapper.h b/aws-lc-sys/include/rust_wrapper.h index 24a5f455d82..77dd9ffb7cf 100644 --- a/aws-lc-sys/include/rust_wrapper.h +++ b/aws-lc-sys/include/rust_wrapper.h @@ -8,9 +8,9 @@ #ifdef _WIN32 #define BORINGSSL_SHARED_LIBRARY -#define AWS_LC_FIPS_SYS_EXPORT __declspec(dllexport) +#define AWS_LC_SYS_EXPORT __declspec(dllexport) #else -#define AWS_LC_FIPS_SYS_EXPORT __attribute__((visibility("default"))) +#define AWS_LC_SYS_EXPORT __attribute__((visibility("default"))) #endif #include @@ -23,9 +23,9 @@ extern "C" { // The following functions are wrappers over inline functions and macros in // BoringSSL, which bindgen cannot currently correctly bind. These wrappers // ensure changes to the functions remain in lockstep with the Rust versions. -AWS_LC_FIPS_SYS_EXPORT int ERR_GET_LIB_RUST(uint32_t packed_error); -AWS_LC_FIPS_SYS_EXPORT int ERR_GET_REASON_RUST(uint32_t packed_error); -AWS_LC_FIPS_SYS_EXPORT int ERR_GET_FUNC_RUST(uint32_t packed_error); +AWS_LC_SYS_EXPORT int ERR_GET_LIB_RUST(uint32_t packed_error); +AWS_LC_SYS_EXPORT int ERR_GET_REASON_RUST(uint32_t packed_error); +AWS_LC_SYS_EXPORT int ERR_GET_FUNC_RUST(uint32_t packed_error); #if defined(__cplusplus)