From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Jan 2012 22:29:05 +0000 (-0500)
Subject: move LINENO define to where it actually belongs
X-Git-Tag: v3.3.0a1~373
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0beabc2a57f6599a411d3b5579dd6c64ffd47b7;p=thirdparty%2FPython%2Fcpython.git

move LINENO define to where it actually belongs
---

diff --git a/Include/node.h b/Include/node.h
index e23e709fffa3..d161195b2308 100644
--- a/Include/node.h
+++ b/Include/node.h
@@ -28,6 +28,7 @@ PyAPI_FUNC(void) PyNode_Free(node *n);
 #define RCHILD(n, i)	(CHILD(n, NCH(n) + i))
 #define TYPE(n)		((n)->n_type)
 #define STR(n)		((n)->n_str)
+#define LINENO(n)       ((n)->n_lineno)
 
 /* Assert that the type of a node is what we expect */
 #define REQ(n, type) assert(TYPE(n) == (type))
diff --git a/Python/ast.c b/Python/ast.c
index 26163f713210..66b85b5a7f53 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -521,10 +521,6 @@ static PyObject *parsestr(struct compiling *, const node *n, int *bytesmode);
 static PyObject *parsestrplus(struct compiling *, const node *n,
                               int *bytesmode);
 
-#ifndef LINENO
-#define LINENO(n)       ((n)->n_lineno)
-#endif
-
 #define COMP_GENEXP   0
 #define COMP_LISTCOMP 1
 #define COMP_SETCOMP  2