From 58f7c5a9554e95b030e5d72f7ef4e48db87a6149 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 8 Sep 2016 11:37:36 -0700 Subject: [PATCH] Reindeint DK_xxx macros Issue #27350. --- Objects/dictobject.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Objects/dictobject.c b/Objects/dictobject.c index ff285bda89..be0d72163a 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -281,14 +281,19 @@ PyDict_Fini(void) #define DK_SIZE(dk) ((dk)->dk_size) #if SIZEOF_VOID_P > 4 -#define DK_IXSIZE(dk) (DK_SIZE(dk) <= 0xff ? 1 : DK_SIZE(dk) <= 0xffff ? 2 : \ - DK_SIZE(dk) <= 0xffffffff ? 4 : sizeof(Py_ssize_t)) +#define DK_IXSIZE(dk) \ + (DK_SIZE(dk) <= 0xff ? \ + 1 : DK_SIZE(dk) <= 0xffff ? \ + 2 : DK_SIZE(dk) <= 0xffffffff ? \ + 4 : sizeof(Py_ssize_t)) #else -#define DK_IXSIZE(dk) (DK_SIZE(dk) <= 0xff ? 1 : DK_SIZE(dk) <= 0xffff ? 2 : \ - sizeof(Py_ssize_t)) +#define DK_IXSIZE(dk) \ + (DK_SIZE(dk) <= 0xff ? \ + 1 : DK_SIZE(dk) <= 0xffff ? \ + 2 : sizeof(Py_ssize_t)) #endif -#define DK_ENTRIES(dk) ((PyDictKeyEntry*)(&(dk)->dk_indices[DK_SIZE(dk) * \ - DK_IXSIZE(dk)])) +#define DK_ENTRIES(dk) \ + ((PyDictKeyEntry*)(&(dk)->dk_indices[DK_SIZE(dk) * DK_IXSIZE(dk)])) #define DK_DEBUG_INCREF _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA #define DK_DEBUG_DECREF _Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA -- 2.50.0