diff options
| author | Ben Laurie <ben@openssl.org> | 2011-11-14 00:36:10 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2011-11-14 00:36:10 +0000 |
| commit | ae551760917614647ad6fbacec6e4c1b495a94cf (patch) | |
| tree | 34a1985c9beb2aa0a43904de8e733796c40df48c /engines | |
| parent | fe0686483621d420705e881cd9187788a0691583 (diff) | |
| download | openssl-new-ae551760917614647ad6fbacec6e4c1b495a94cf.tar.gz | |
Fix some warnings caused by __owur. Temporarily (I hope) remove the more
aspirational __owur annotations.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_padlock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/e_padlock.c b/engines/e_padlock.c index a19f173536..eaee67ecbf 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -100,10 +100,10 @@ #undef COMPILE_HW_PADLOCK #if !defined(I386_ONLY) && !defined(OPENSSL_NO_ASM) -# if defined(__i386__) || defined(__i386) || \ +# if (defined(__i386__) || defined(__i386) || \ defined(__x86_64__) || defined(__x86_64) || \ defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) + defined(__INTEL__)) && !defined(__MACH__) # define COMPILE_HW_PADLOCK # ifdef OPENSSL_NO_DYNAMIC_ENGINE static ENGINE *ENGINE_padlock (void); |