aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys-extras
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-02-10 09:36:44 -0800
committerSteven Fackler <[email protected]>2016-02-10 09:36:44 -0800
commit7540471ce0b4c25ba151655d43b58bd42171c511 (patch)
treea08ec37e8e43c72d9e0a25c4584c5728c69a74f1 /openssl-sys-extras
parentMerge branch 'release-v0.7.5' into release (diff)
parentRelease v0.7.6 (diff)
downloadrust-openssl-0.7.6.tar.xz
rust-openssl-0.7.6.zip
Merge branch 'release-v0.7.6' into releasev0.7.6
Diffstat (limited to 'openssl-sys-extras')
-rw-r--r--openssl-sys-extras/Cargo.toml6
-rw-r--r--openssl-sys-extras/src/lib.rs2
-rw-r--r--openssl-sys-extras/src/openssl_shim.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/openssl-sys-extras/Cargo.toml b/openssl-sys-extras/Cargo.toml
index 99bb3b71..0607d3bb 100644
--- a/openssl-sys-extras/Cargo.toml
+++ b/openssl-sys-extras/Cargo.toml
@@ -1,11 +1,11 @@
[package]
name = "openssl-sys-extras"
-version = "0.7.5"
+version = "0.7.6"
authors = ["Steven Fackler <[email protected]>"]
license = "MIT"
description = "Extra FFI bindings to OpenSSL that require a C shim"
repository = "https://github.com/sfackler/rust-openssl"
-documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.5/openssl_sys_extras"
+documentation = "https://sfackler.github.io/rust-openssl/doc/v0.7.6/openssl_sys_extras"
build = "build.rs"
[features]
@@ -13,7 +13,7 @@ ecdh_auto = []
[dependencies]
libc = "0.2"
-openssl-sys = { version = "0.7.5", path = "../openssl-sys" }
+openssl-sys = { version = "0.7.6", path = "../openssl-sys" }
[build-dependencies]
gcc = "0.3"
diff --git a/openssl-sys-extras/src/lib.rs b/openssl-sys-extras/src/lib.rs
index a6b372a7..9647929a 100644
--- a/openssl-sys-extras/src/lib.rs
+++ b/openssl-sys-extras/src/lib.rs
@@ -1,5 +1,5 @@
#![allow(non_upper_case_globals, non_snake_case)]
-#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.5")]
+#![doc(html_root_url="https://sfackler.github.io/rust-openssl/doc/v0.7.6")]
extern crate openssl_sys;
extern crate libc;
diff --git a/openssl-sys-extras/src/openssl_shim.c b/openssl-sys-extras/src/openssl_shim.c
index c3deeebc..a4b40280 100644
--- a/openssl-sys-extras/src/openssl_shim.c
+++ b/openssl-sys-extras/src/openssl_shim.c
@@ -5,8 +5,8 @@
#if defined(__APPLE__) || defined(__linux)
-#include<pthread.h>
-#include<openssl/crypto.h>
+#include <pthread.h>
+#include <openssl/crypto.h>
unsigned long thread_id()
{