diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:19 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-05-26 20:15:19 -0400 |
commit | 234ea528505d0363c4c4eb0150e7587e863c8e20 (patch) | |
tree | 3328b4f81f13f0adf984bf0514067cd5adda422b /indra/lscript/lscript_compile/indra.l | |
parent | 833579b14b134dce8f378336b9cbcd40cfa72c5f (diff) |
MAINT-5232: Having an IF macro collides with helper libraries.
Changing to IFF in the lex/yacc sources (which are supposedly deprecated on
the viewer side anyway!) unbreaks Mac builds.
Diffstat (limited to 'indra/lscript/lscript_compile/indra.l')
-rwxr-xr-x | indra/lscript/lscript_compile/indra.l | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 7772c95609..d5c71d9987 100755 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -102,7 +102,7 @@ int yyerror(const char *fmt, ...); "event" { count(); return(EVENT); } "jump" { count(); return(JUMP); } "return" { count(); return(RETURN); } -"if" { count(); return(IF); } +"if" { count(); return(IFF); } "else" { count(); return(ELSE); } "for" { count(); return(FOR); } "do" { count(); return(DO); } |