Merge 3.5
This commit is contained in:
commit
4d45be776c
|
@ -73,7 +73,7 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise)
|
|||
}
|
||||
|
||||
#elif defined(HAVE_GETENTROPY) && !defined(sun)
|
||||
#define PY_GETENTROPY
|
||||
#define PY_GETENTROPY 1
|
||||
|
||||
/* Fill buffer with size pseudo-random bytes generated by getentropy().
|
||||
Return 0 on success, or raise an exception and return -1 on error.
|
||||
|
@ -112,7 +112,7 @@ py_getentropy(unsigned char *buffer, Py_ssize_t size, int fatal)
|
|||
#else
|
||||
|
||||
#if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL)
|
||||
#define PY_GETRANDOM
|
||||
#define PY_GETRANDOM 1
|
||||
|
||||
static int
|
||||
py_getrandom(void *buffer, Py_ssize_t size, int raise)
|
||||
|
|
Loading…
Reference in New Issue