From 2453c0f96c18530e8d0326a0585b678717f2f043 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Wed, 25 Mar 2015 22:02:14 -0700
Subject: [PATCH] Fix npn feature

---
 openssl/src/ssl/mod.rs   | 4 ++++
 openssl/src/ssl/tests.rs | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 0763c207..aa3d5280 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -13,6 +13,10 @@ use std::ptr;
 use std::sync::{Once, ONCE_INIT, Arc};
 use std::ops::{Deref, DerefMut};
 use std::cmp;
+#[cfg(feature = "npn")]
+use libc::{c_uchar, c_uint};
+#[cfg(feature = "npn")]
+use std::slice;
 
 use bio::{MemBio};
 use ffi;
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index 3000dae0..5322ebde 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -3,6 +3,10 @@ use std::net::TcpStream;
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
+#[cfg(feature = "npn")]
+use std::net::TcpListener;
+#[cfg(feature = "npn")]
+use std::thread;
 
 use crypto::hash::Type::{SHA256};
 use ssl;
@@ -10,6 +14,8 @@ use ssl::SslMethod::Sslv23;
 use ssl::{SslContext, SslStream, VerifyCallback};
 use ssl::SslVerifyMode::SslVerifyPeer;
 use x509::X509StoreContext;
+#[cfg(feature = "npn")]
+use x509::X509FileType;
 
 #[test]
 fn test_new_ctx() {