changeset 30112:9b6ff0f940ed

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.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 09 Oct 2016 13:50:53 +0200
parents a989fa78dafa
children ffb682412b98
files mercurial/parsers.c mercurial/util.h
diffstat 2 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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] = {
--- 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