(original) (raw)

changeset: 103345:fc8aaa073eb4 user: Victor Stinner victor.stinner@gmail.com date: Thu Sep 08 11:37:36 2016 -0700 files: Objects/dictobject.c description: Reindeint DK_xxx macros Issue #27350. diff -r 48a1f97d03b4 -r fc8aaa073eb4 Objects/dictobject.c --- a/Objects/dictobject.c Thu Sep 08 11:35:46 2016 -0700 +++ b/Objects/dictobject.c Thu Sep 08 11:37:36 2016 -0700 @@ -281,14 +281,19 @@ #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 /victor.stinner@gmail.com