From 36d2e67db9a53175accad32454af6316d6b12b82 Mon Sep 17 00:00:00 2001 From: Stefan Krah Date: Mon, 19 Jul 2010 12:36:57 +0000 Subject: [PATCH] Issue #9036: Throughout the code base, Py_CHARMASK is used on 8-bit wide signed/unsigned chars or on integers directly derived from those. In all cases, it could be replaced by a simple cast to (unsigned char). Reasons for the change: a) Make the comment more explicit. b) If char is unsigned, the cast is optimized away. c) If char is unsigned, gcc emits spurious "array subscript has type 'char'" warnings. --- Include/Python.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Include/Python.h b/Include/Python.h index c0e469ecdb9..972beec7cbb 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -134,13 +134,8 @@ PyAPI_FUNC(wchar_t *) _Py_char2wchar(char *); } #endif -/* Convert a possibly signed character to a nonnegative int */ -/* XXX This assumes characters are 8 bits wide */ -#ifdef __CHAR_UNSIGNED__ -#define Py_CHARMASK(c) (c) -#else +/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ #define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) -#endif #include "pyfpe.h"