Mar 9, 2024 · Oct 28, 2023 · Oct 29, 2023 · Oct 30, 2023 · Oct 30, 2023 · Oct 31, 2023
diff --git a/Include/cpython/pyhash.h b/Include/cpython/pyhash.h
 #  define_PyHASH_BITS 31
 #endif

 #definePyHASH_BITS _PyHASH_BITS

 #define_PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
 #definePyHASH_MODULUS _PyHASH_MODULUS
 #define_PyHASH_INF 314159
 #definePyHASH_INF _PyHASH_INF
 #define_PyHASH_IMAG _PyHASH_MULTIPLIER
 #definePyHASH_IMAG _PyHASH_IMAG

 /* Helpers for hash functions */
 PyAPI_FUNC(Py_hash_t)_Py_HashDouble(PyObject*,double);
diff --git a/Include/pyhash.h b/Include/pyhash.h
 extern "C" {
 #endif

 /* Prime multiplier used in string and various other hashes. */
 #define _PyHASH_MULTIPLIER 1000003UL  /* 0xf4243 */

 /* Parameters used for the numeric hash implementation.  See notes for
   _Py_HashDouble in Python/pyhash.c.  Numeric hashes are based on
   reduction modulo the prime 2**_PyHASH_BITS - 1. */

 #if SIZEOF_VOID_P >= 8
 #  define _PyHASH_BITS 61
 #else
 #  define _PyHASH_BITS 31
 #endif

 #define PyHASH_BITS _PyHASH_BITS

 #define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
 #define PyHASH_MODULUS _PyHASH_MODULUS
 #define _PyHASH_INF 314159
 #define PyHASH_INF _PyHASH_INF
 #define _PyHASH_IMAG _PyHASH_MULTIPLIER
 #define PyHASH_IMAG _PyHASH_IMAG

 /* Cutoff for small string DJBX33A optimization in range [1, cutoff).
 *
 * About 50% of the strings in a typical Python application are smaller than
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,9 +15,14 @@
		# define_PyHASH_BITS 31
		#endif

		#definePyHASH_BITS _PyHASH_BITS
skirpichev marked this conversation as resolved. OutdatedShow resolvedHide resolved

		#define_PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
		#definePyHASH_MODULUS _PyHASH_MODULUS
		#define_PyHASH_INF 314159
		#definePyHASH_INF _PyHASH_INF
		#define_PyHASH_IMAG _PyHASH_MULTIPLIER
		#definePyHASH_IMAG _PyHASH_IMAG

		/* Helpers for hash functions */
		PyAPI_FUNC(Py_hash_t)_Py_HashDouble(PyObject*,double);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,28 +4,6 @@
		extern "C" {
		#endif

		/* Prime multiplier used in string and various other hashes. */
		#define _PyHASH_MULTIPLIER 1000003UL /* 0xf4243 */

		/* Parameters used for the numeric hash implementation. See notes for
		_Py_HashDouble in Python/pyhash.c. Numeric hashes are based on
		reduction modulo the prime 2*_PyHASH_BITS - 1. /

		#if SIZEOF_VOID_P >= 8
		# define _PyHASH_BITS 61
		#else
		# define _PyHASH_BITS 31
		#endif

		#define PyHASH_BITS _PyHASH_BITS

		#define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1)
		#define PyHASH_MODULUS _PyHASH_MODULUS
		#define _PyHASH_INF 314159
		#define PyHASH_INF _PyHASH_INF
		#define _PyHASH_IMAG _PyHASH_MULTIPLIER
		#define PyHASH_IMAG _PyHASH_IMAG

		/* Cutoff for small string DJBX33A optimization in range [1, cutoff).
		*
		* About 50% of the strings in a typical Python application are smaller than
Expand Down