Commit03e441d

authored

Relax PYPY_VERSION_NUM requirements for hash macros (#122)

Those added inpypy/pypy@5661dffwhich is available in PyPy 7.3.8+.

1 parent77abeec commit03e441dCopy full SHA for 03e441d

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1204,11 +1204,11 @@ static inline int PyTime_PerfCounter(PyTime_t *result)`
`1204`	`1204`	`#endif`
`1205`	`1205`
`1206`	`1206`	`// gh-111389 added hash constants to Python 3.13.0a5. These constants were`
`1207`		`-// added first as private macros to Python 3.4.0b1 and PyPy 7.3.9.`
	`1207`	`+// added first as private macros to Python 3.4.0b1 and PyPy 7.3.8.`
`1208`	`1208`	`#if (!defined(PyHASH_BITS) \`
`1209`	`1209`	`&& ((!defined(PYPY_VERSION) && PY_VERSION_HEX >=0x030400B1) \`
`1210`	`1210`	`\|\| (defined(PYPY_VERSION) && PY_VERSION_HEX >=0x03070000 \`
`1211`		`- && PYPY_VERSION_NUM >=0x07090000)))`
	`1211`	`+ && PYPY_VERSION_NUM >=0x07030800)))`
`1212`	`1212`	`#definePyHASH_BITS _PyHASH_BITS`
`1213`	`1213`	`#definePyHASH_MODULUS _PyHASH_MODULUS`
`1214`	`1214`	`#definePyHASH_INF _PyHASH_INF`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1616,7 +1616,7 @@ test_hash(PyObject Py_UNUSED(module), PyObject Py_UNUSED(args))`
`1616`	`1616`
`1617`	`1617`	`#if ((!defined(PYPY_VERSION)&&PY_VERSION_HEX >=0x030400B1) \`
`1618`	`1618`	`\|\| (defined(PYPY_VERSION)&&PY_VERSION_HEX >=0x03070000 \`
`1619`		`-&&PYPY_VERSION_NUM >=0x07090000))`
	`1619`	`+&&PYPY_VERSION_NUM >=0x07030800))`
`1620`	`1620`	`// Just check that constants are available`
`1621`	`1621`	`size_tbits=PyHASH_BITS;`
`1622`	`1622`	`assert(bits >=8);`

Comments

(0)