From 912cacf4bc3ea28003c5aa41f6cfd7a5989ba7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= <manuel.schoelling@gmx.de>
Date: Fri, 3 Apr 2015 16:58:05 +0200
Subject: Fix rebase errors

---
 openssl-sys/src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'openssl-sys/src')

diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 0e41a682..109c4168 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -513,7 +513,6 @@ extern "C" {
 
     pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX;
     pub fn SSL_CTX_free(ctx: *mut SSL_CTX);
-    pub fn SSL_CTX_ctrl(ctx: *mut SSL_CTX, cmd: c_int, mode: c_long, parg: *mut c_void) -> c_long;
     pub fn SSL_CTX_set_verify(ctx: *mut SSL_CTX, mode: c_int,
                               verify_callback: Option<extern fn(c_int, *mut X509_STORE_CTX) -> c_int>);
     pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int);
-- 
cgit v1.2.3