Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: patches/STORE_ATTR_INFO_compare_declaration_conflict.patch

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« openssl.gyp ('K') | « openssl/util/ssleay.num ('k') | patches/empty_OPENSSL_cpuid_setup.patch » ('j') | patches/x509_hash_name_algorithm_change.patch » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/STORE_ATTR_INFO_compare_declaration_conflict.patch
===================================================================
--- patches/STORE_ATTR_INFO_compare_declaration_conflict.patch (revision 0)
+++ patches/STORE_ATTR_INFO_compare_declaration_conflict.patch (revision 0)
@@ -0,0 +1,11 @@
+--- openssl-1.0.0f-origin/crypto/store/str_locl.h 2004-05-18 02:49:06.000000000 +0800
++++ openssl-1.0.0f/crypto/store/str_locl.h 2012-01-19 02:17:50.751681437 +0800
+@@ -60,7 +60,7 @@
+ #define HEADER_STORE_LOCL_H
+
+ #include <openssl/crypto.h>
+-#include <openssl/store.h>
++#include "store.h"
+
+ #ifdef __cplusplus
+ extern "C" {
« openssl.gyp ('K') | « openssl/util/ssleay.num ('k') | patches/empty_OPENSSL_cpuid_setup.patch » ('j') | patches/x509_hash_name_algorithm_change.patch » ('J')

Powered by Google App Engine
This is Rietveld 408576698