# HG changeset patch # User Gregory Szorc # Date 1476013853 -7200 # Node ID 9b6ff0f940ed2ee33516aac22d5c69914400af7a # Parent a989fa78dafa228d09c12c48e9e2d85ed7a9beb7 parsers: move PyInt aliasing out of util.h The PyInt aliasing is only used by parsers.c. Since we don't want to encourage the use of PyInt parsing, move the aliasing to parsers.c. diff -r a989fa78dafa -r 9b6ff0f940ed mercurial/parsers.c --- a/mercurial/parsers.c Sun Oct 09 13:47:46 2016 +0200 +++ b/mercurial/parsers.c Sun Oct 09 13:50:53 2016 +0200 @@ -15,6 +15,15 @@ #include "util.h" #include "bitmanipulation.h" +#ifdef IS_PY3K +/* The mapping of Python types is meant to be temporary to get Python + * 3 to compile. We should remove this once Python 3 support is fully + * supported and proper types are used in the extensions themselves. */ +#define PyInt_Type PyLong_Type +#define PyInt_FromLong PyLong_FromLong +#define PyInt_AsLong PyLong_AsLong +#endif + static char *versionerrortext = "Python minor version mismatch"; static int8_t hextable[256] = { diff -r a989fa78dafa -r 9b6ff0f940ed mercurial/util.h --- a/mercurial/util.h Sun Oct 09 13:47:46 2016 +0200 +++ b/mercurial/util.h Sun Oct 09 13:50:53 2016 +0200 @@ -11,16 +11,8 @@ #include "compat.h" #if PY_MAJOR_VERSION >= 3 - #define IS_PY3K -/* The mapping of Python types is meant to be temporary to get Python - * 3 to compile. We should remove this once Python 3 support is fully - * supported and proper types are used in the extensions themselves. */ -#define PyInt_Type PyLong_Type -#define PyInt_FromLong PyLong_FromLong -#define PyInt_AsLong PyLong_AsLong - -#endif /* PY_MAJOR_VERSION */ +#endif typedef struct { PyObject_HEAD