Index: net/socket/openssl_ssl_util.cc |
diff --git a/net/socket/openssl_ssl_util.cc b/net/socket/openssl_ssl_util.cc |
index 231f77cceacb77134a574cd2fba5581bb7a69f96..a11436ce0d5191c3f1c2c97748ac0b181a5e767e 100644 |
--- a/net/socket/openssl_ssl_util.cc |
+++ b/net/socket/openssl_ssl_util.cc |
@@ -4,8 +4,6 @@ |
#include "net/socket/openssl_ssl_util.h" |
-#include <errno.h> |
- |
#include <openssl/err.h> |
#include <openssl/ssl.h> |
@@ -41,16 +39,16 @@ class OpenSSLNetErrorLibSingleton { |
net_error_lib_ = ERR_get_next_error_library(); |
} |
- unsigned net_error_lib() const { return net_error_lib_; } |
+ int net_error_lib() const { return net_error_lib_; } |
private: |
- unsigned net_error_lib_; |
+ int net_error_lib_; |
}; |
base::LazyInstance<OpenSSLNetErrorLibSingleton>::Leaky g_openssl_net_error_lib = |
LAZY_INSTANCE_INITIALIZER; |
-unsigned OpenSSLNetErrorLib() { |
+int OpenSSLNetErrorLib() { |
return g_openssl_net_error_lib.Get().net_error_lib(); |
} |
@@ -164,7 +162,7 @@ void OpenSSLPutNetError(const tracked_objects::Location& location, int err) { |
NOTREACHED(); |
err = ERR_INVALID_ARGUMENT; |
} |
- ERR_put_error(OpenSSLNetErrorLib(), 0, err, |
+ ERR_PUT_error(OpenSSLNetErrorLib(), 0, err, |
location.file_name(), location.line_number()); |
} |