commit 413c1c10e7ef5db6d96affc899035a863451f5e8
author Craig Tiller <ctiller@google.com> Tue Oct 15 07:46:16 2019 -0700
committer Craig Tiller <ctiller@google.com> Tue Oct 15 07:46:16 2019 -0700
tree da334f74af6b83e52a9456ed43b93deeac3c672d
parent 46fc97f697fd9905c9e501c9710b44e06100562d
parent e4a02b05c8d42f159af58810b693ec4036dc15bf

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

Change-Id: I72f55b818f2ba430996ff8dd148bb7db91dbda3e

src/ffi.rs

diff --git a/src/ffi.rs b/src/ffi.rs
index 03f82c2..f75f45d 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -38,11 +38,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 efb9e14..5238b0e 100644
--- a/src/tls.rs
+++ b/src/tls.rs
@@ -763,6 +763,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;