openssl/engines/e_aep.c - Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: openssl/engines/e_aep.c

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

Index: openssl/engines/e_aep.c

===================================================================

--- openssl/engines/e_aep.c (revision 105093)

+++ openssl/engines/e_aep.c (working copy)

@@ -57,7 +57,7 @@

#include <string.h>

#include <openssl/e_os2.h>

-#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__)

+#if !defined(OPENSSL_SYS_MSDOS) || defined(__DJGPP__) || defined(__MINGW32__)

#include <sys/types.h>

#include <unistd.h>

#else

@@ -68,6 +68,8 @@

#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)

#define getpid GetThreadID

extern int GetThreadID(void);

+#elif defined(_WIN32) && !defined(__WATCOMC__)

+#define getpid _getpid

#endif

#include <openssl/crypto.h>

@@ -867,13 +869,7 @@

CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);

-#ifdef NETWARE_CLIB

- curr_pid = GetThreadID();

-#elif defined(_WIN32)

- curr_pid = _getpid();

-#else

curr_pid = getpid();

-#endif

/*Check if this is the first time this is being called from the current

process*/

« no previous file with comments | « openssl/engines/e_4758cca.c ('k') | openssl/engines/e_capi.c » ('j') | no next file with comments »