commit e057d0dcf53d53f96678dfe3baba086e7595e83a
author Craig Tiller <ctiller@google.com> Thu Feb 13 10:22:22 2020 -0800
committer Craig Tiller <ctiller@google.com> Thu Feb 13 10:22:22 2020 -0800
tree 47ccf82efc8e9301f8584939d158d1477ba9467d
parent 413c1c10e7ef5db6d96affc899035a863451f5e8
parent 0bee4aef0400eb69aeb6fa1352332f561eeb4635

Merge branch 'master' of github.com:cloudflare/quiche into update

Change-Id: Icf03bc27789bc8c620f3a6b49b75233f3c0c6393

src/ffi.rs

diff --git a/src/ffi.rs b/src/ffi.rs
index a5be0d9..831faee 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -37,11 +37,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 6d69883..24b2962 100644
--- a/src/tls.rs
+++ b/src/tls.rs
@@ -819,6 +819,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;