Merge branch 'tweaks-for-linux'

This commit is contained in:
dignifiedquire
2019-04-26 23:08:03 +03:00
3 changed files with 1 additions and 3 deletions

View File

@@ -15,7 +15,6 @@ fn main() {
println!("cargo:rustc-link-search=/usr/local/lib");
println!("cargo:rustc-link-lib=static=etpan");
println!("cargo:rustc-link-lib=dylib=iconv");
println!("cargo:rustc-link-lib=dylib=sasl2");
println!("cargo:rustc-link-lib=dylib=z");
@@ -24,6 +23,7 @@ fn main() {
println!("cargo:rustc-link-lib=dylib=tools");
if std::env::var("TARGET").unwrap().contains("-apple") {
println!("cargo:rustc-link-lib=dylib=iconv");
println!("cargo:rustc-link-lib=framework=CoreFoundation");
println!("cargo:rustc-link-lib=framework=CoreServices");
println!("cargo:rustc-link-lib=framework=Security");

View File

@@ -33,7 +33,6 @@ pub unsafe extern "C" fn dc_strbuilder_init(
(*strbuilder).free = (*strbuilder).allocated - 1i32;
(*strbuilder).eos = (*strbuilder).buf;
}
#[no_mangle]
pub unsafe extern "C" fn dc_strbuilder_cat(
mut strbuilder: *mut dc_strbuilder_t,
mut text: *const libc::c_char,

View File

@@ -19,7 +19,6 @@ pub unsafe extern "C" fn dc_exactly_one_bit_set(mut v: libc::c_int) -> libc::c_i
}
/* string tools */
/* dc_strdup() returns empty string if NULL is given, never returns NULL (exits on errors) */
#[no_mangle]
pub unsafe extern "C" fn dc_strdup(mut s: *const libc::c_char) -> *mut libc::c_char {
let mut ret: *mut libc::c_char = 0 as *mut libc::c_char;
if !s.is_null() {