summaryrefslogtreecommitdiff
path: root/indra/lscript
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-10 22:39:31 -0400
committerOz Linden <oz@lindenlab.com>2011-04-10 22:39:31 -0400
commit60bceb759b592348b403689ffa8ed9c768126f8b (patch)
tree33b0ece80cc12f390683d89c30f2a706fa87bd50 /indra/lscript
parentc9c192e2c476e73807d23cdda0814cb221a96b95 (diff)
parente2baffa940a5797f2055f13ceb9722de524b2ec3 (diff)
merge changes for storm-954
Diffstat (limited to 'indra/lscript')
-rw-r--r--indra/lscript/lscript_compile/indra.l5
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