diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-07-07 06:58:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-07-07 06:58:16 (GMT) |
| commit | 50600a78cb6b0e4ea47033a2fd5e982c20a5d946 (patch) | |
| tree | 766e594bf7dd7507f2ffb9f0844fbed5c61e82b6 /Modules | |
| parent | c13d85bf8d769bba49c737c326b483b257a997b0 (diff) | |
| parent | b8a2f51ceb636878ec767554eddbb11ff4502c55 (diff) | |
| download | cpython-50600a78cb6b0e4ea47033a2fd5e982c20a5d946.zip cpython-50600a78cb6b0e4ea47033a2fd5e982c20a5d946.tar.gz cpython-50600a78cb6b0e4ea47033a2fd5e982c20a5d946.tar.bz2 | |
merge 3.5 (#24557)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 4 | ||||
| -rw-r--r-- | Modules/clinic/_ssl.c.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index ead5b0e..1c684b1 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3938,7 +3938,7 @@ _ssl_RAND_status_impl(PyModuleDef *module) return PyLong_FromLong(RAND_status()); } -#ifdef HAVE_RAND_EGD +#ifndef OPENSSL_NO_EGD /*[clinic input] _ssl.RAND_egd path: object(converter="PyUnicode_FSConverter") @@ -3964,7 +3964,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module, PyObject *path) } return PyLong_FromLong(bytes); } -#endif /* HAVE_RAND_EGD */ +#endif /* OPENSSL_NO_EGD */ diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h index 2bf46b5..1d9f91d 100644 --- a/Modules/clinic/_ssl.c.h +++ b/Modules/clinic/_ssl.c.h @@ -921,7 +921,7 @@ _ssl_RAND_status(PyModuleDef *module, PyObject *Py_UNUSED(ignored)) return _ssl_RAND_status_impl(module); } -#if defined(HAVE_RAND_EGD) +#if !defined(OPENSSL_NO_EGD) PyDoc_STRVAR(_ssl_RAND_egd__doc__, "RAND_egd($module, path, /)\n" @@ -953,7 +953,7 @@ exit: return return_value; } -#endif /* defined(HAVE_RAND_EGD) */ +#endif /* !defined(OPENSSL_NO_EGD) */ PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__, "get_default_verify_paths($module, /)\n" @@ -1135,4 +1135,4 @@ exit: #ifndef _SSL_ENUM_CRLS_METHODDEF #define _SSL_ENUM_CRLS_METHODDEF #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */ -/*[clinic end generated code: output=c6fe203099a5aa89 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=df99659ec790e573 input=a9049054013a1b77]*/ |