summaryrefslogtreecommitdiff
path: root/indra/lscript
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-01 12:47:19 -0400
committerOz Linden <oz@lindenlab.com>2011-04-01 12:47:19 -0400
commit2f74cd32791dc9025e1e396b2f535fdfb6b1ca87 (patch)
tree6d57ab7f0d3ea7717276fca421e98547d52b5124 /indra/lscript
parent6bee9532207cfabd1c6315ea00fa7703bc401d2c (diff)
parenta03f6997d8c3519e2c89930a1ed03a787af6f7ae (diff)
merge changes for storm-1130
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