commit 82a2ba91566844c830e83446059172b1a3d1bfd6
author Craig Tiller <craig.tiller@gmail.com> Fri Apr 17 12:59:29 2020 -0700
committer Craig Tiller <craig.tiller@gmail.com> Fri Apr 17 12:59:29 2020 -0700
tree b18ce643231819c590c877c68471663129c68fb8
parent 9c5dec65c498be820b5ab2c814a00ff52ce590a5
parent 7a435fdf7acc21c633e75f0200809fbb3a2b3fc6

Merge http://github.com/cloudflare/quiche into HEAD

Change-Id: I720ef459c96d4e742776225b582b44940fcc6666

src/ffi.rs

diff --git a/src/ffi.rs b/src/ffi.rs
index f54ff59..5898852 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -40,11 +40,11 @@
 
 use crate::*;
 
-#[no_mangle]
-pub extern fn quiche_version() -> *const u8 {
-    static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "\0");
-    VERSION.as_ptr()
-}
+// #[no_mangle]
+// pub extern fn quiche_version() -> *const u8 {
+//     static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), "\0");
+//     VERSION.as_ptr()
+// }
 
 struct Logger {
     cb: extern fn(line: *const u8, argp: *mut c_void),

src/tls.rs

diff --git a/src/tls.rs b/src/tls.rs
index adebc1f..56b575c 100644
--- a/src/tls.rs
+++ b/src/tls.rs
@@ -891,6 +891,12 @@
     trace!("{}", std::str::from_utf8(&err).unwrap());
 }
 
+#[cfg(not(target_os = "fuchsia"))]
+#[link(name = "stdc++")]
+extern {}
+
+#[link(name = "ssl")]
+#[link(name = "crypto")]
 extern {
     // SSL_METHOD
     fn TLS_method() -> *const SSL_METHOD;