[pypy-commit] pypy stmgc-c7: Bah? term.h contains "#define tab ..."

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70777:2305dd958f77
Date: 2014-04-19 18:47 +0200
http://bitbucket.org/pypy/pypy/changeset/2305dd958f77/

Log:	Bah? term.h contains "#define tab ..."

diff --git a/rpython/translator/stm/src_stm/extracode.h b/rpython/translator/stm/src_stm/extracode.h
--- a/rpython/translator/stm/src_stm/extracode.h
+++ b/rpython/translator/stm/src_stm/extracode.h
@@ -98,16 +98,16 @@
         fntrunc = "...";
     }
 
-    long tablen = RPyString_Size(co_lnotab);
-    char *tab = _RPyString_AsString(co_lnotab);
+    long lnotablen = RPyString_Size(co_lnotab);
+    char *lnotab = _RPyString_AsString(co_lnotab);
     uintptr_t next_instr = odd_number >> 1;
     long line = co_firstlineno;
     uintptr_t i, addr = 0;
-    for (i = 0; i < tablen; i += 2) {
-        addr += ((unsigned char *)tab)[i];
+    for (i = 0; i < lnotablen; i += 2) {
+        addr += ((unsigned char *)lnotab)[i];
         if (addr > next_instr)
             break;
-        line += ((unsigned char *)tab)[i + 1];
+        line += ((unsigned char *)lnotab)[i + 1];
     }
 
     snprintf(outputbuf, outputbufsize, "File \"%s%.*s\", line %ld, in %.*s%s",