diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-18 22:23:17 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-01-18 22:23:17 -0500 |
| commit | 535dee02154cbb842fab2fdf6706e10ab57a5840 (patch) | |
| tree | 537fc553a13bc478959a12ab15479530ad498e2e /src/_cffi_src/openssl | |
| parent | 9244deaa07e92399556e8f5d0f7b32cf79f2e201 (diff) | |
| parent | 96f7cdb53e1cd46a6432cda24d2aec98fabf81a9 (diff) | |
| download | cryptography-535dee02154cbb842fab2fdf6706e10ab57a5840.tar.gz cryptography-535dee02154cbb842fab2fdf6706e10ab57a5840.tar.bz2 cryptography-535dee02154cbb842fab2fdf6706e10ab57a5840.zip | |
Merge pull request #2678 from reaperhulk/windows-hacks
consolidate the windows specific header trickery we need to do
Diffstat (limited to 'src/_cffi_src/openssl')
| -rw-r--r-- | src/_cffi_src/openssl/cms.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/cms.py b/src/_cffi_src/openssl/cms.py index fef7325c..dbe276e9 100644 --- a/src/_cffi_src/openssl/cms.py +++ b/src/_cffi_src/openssl/cms.py @@ -6,11 +6,6 @@ from __future__ import absolute_import, division, print_function INCLUDES = """ #if !defined(OPENSSL_NO_CMS) && OPENSSL_VERSION_NUMBER >= 0x0090808fL -/* The next define should really be in the OpenSSL header, but it is missing. - Failing to include this on Windows causes compilation failures. */ -#if defined(OPENSSL_SYS_WINDOWS) -#include <windows.h> -#endif #include <openssl/cms.h> #endif """ |