Show
Ignore:
Timestamp:
07/28/11 16:31:20 (2 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1311870680 -0400
git-parent:

[44b47a085a3312bcaf73253fde40e4f9781f12a1]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1311870680 -0400
Message:

namespace the getline() it's pissing my Lion install off

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/lua/src/ldebug.c

    r22d1941 re93b5f6  
    4747    return -1;  /* only active lua functions have current-line information */ 
    4848  else 
    49     return getline(ci_func(ci)->l.p, pc); 
     49    return lua__getline(ci_func(ci)->l.p, pc); 
    5050} 
    5151 

  • src/lua/src/ldebug.h

    r22d1941 re93b5f6  
    1414#define pcRel(pc, p)    (cast(int, (pc) - (p)->code) - 1) 
    1515 
    16 #define getline(f,pc) (((f)->lineinfo) ? (f)->lineinfo[pc] : 0) 
     16#define lua__getline(f,pc)    (((f)->lineinfo) ? (f)->lineinfo[pc] : 0) 
    1717 
    1818#define resethookcount(L)       (L->hookcount = L->basehookcount) 

  • src/lua/src/lvm.c

    r22d1941 re93b5f6  
    6969    Proto *p = ci_func(L->ci)->l.p; 
    7070    int npc = pcRel(pc, p); 
    71     int newline = getline(p, npc); 
     71    int newline = lua__getline(p, npc); 
    7272    /* call linehook when enter a new function, when jump back (loop), 
    7373       or when enter a new line */ 
    74     if (npc == 0 || pc <= oldpc || newline != getline(p, pcRel(oldpc, p))) 
     74    if (npc == 0 || pc <= oldpc || newline != lua__getline(p, pcRel(oldpc, p))) 
    7575      luaD_callhook(L, LUA_HOOKLINE, newline); 
    7676  } 

  • src/lua/src/print.c

    r22d1941 re93b5f6  
    8585  int bx=GETARG_Bx(i); 
    8686  int sbx=GETARG_sBx(i); 
    87   int line=getline(f,pc); 
     87  int line=lua__getline(f,pc); 
    8888  printf("\t%d\t",pc+1); 
    8989  if (line>0) printf("[%d]\t",line); else printf("[-]\t");