diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
tree | fac07085cf1b416ef3fb240961913758ebf6b435 /indra/lscript/lscript_compile | |
parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) |
merge out 2.6.0 changes from viewer-development
Diffstat (limited to 'indra/lscript/lscript_compile')
-rw-r--r-- | indra/lscript/lscript_compile/indra.l | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l index 8fe9f5ed29..188c9e1950 100644 --- a/indra/lscript/lscript_compile/indra.l +++ b/indra/lscript/lscript_compile/indra.l @@ -8,8 +8,11 @@ FS (f|F) %n 4000 %p 5000 +%top { + #include "linden_common.h" +} + %{ -#include "linden_common.h" // Deal with the fact that lex/yacc generates unreachable code #ifdef LL_WINDOWS #pragma warning (disable : 4018) // warning C4018: signed/unsigned mismatch |