diff options
author | Chris Tuchs | 2011-05-08 03:06:23 -0700 |
---|---|---|
committer | Chris Tuchs | 2011-05-08 03:06:23 -0700 |
commit | 7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7 (patch) | |
tree | fe9134ed7c34b81a39570d0988b7147f153bd9bb /linden/indra/lscript/lscript_compile | |
parent | Windows build change I am sure of (diff) | |
download | meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.zip meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.tar.gz meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.tar.bz2 meta-impy-7f1cbfae2af93ec11f79b8e2d1db22822ffb6dc7.tar.xz |
Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ll_snprintf, namespace hacks confused vc2005
Diffstat (limited to 'linden/indra/lscript/lscript_compile')
-rw-r--r-- | linden/indra/lscript/lscript_compile/lscript_tree.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp index 984e7b0..2a927a4 100644 --- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp +++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp | |||
@@ -8805,7 +8805,7 @@ void LLScriptIf::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass p | |||
8805 | case LSCP_EMIT_BYTE_CODE: | 8805 | case LSCP_EMIT_BYTE_CODE: |
8806 | { | 8806 | { |
8807 | char jumpname[32]; /*Flawfinder: ignore*/ | 8807 | char jumpname[32]; /*Flawfinder: ignore*/ |
8808 | snprintf(jumpname, sizeof(jumpname),"##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 8808 | ll_snprintf(jumpname, sizeof(jumpname),"##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
8809 | 8809 | ||
8810 | mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); | 8810 | mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); |
8811 | chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]); | 8811 | chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]); |
@@ -8891,9 +8891,9 @@ void LLScriptIfElse::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePa | |||
8891 | case LSCP_EMIT_BYTE_CODE: | 8891 | case LSCP_EMIT_BYTE_CODE: |
8892 | { | 8892 | { |
8893 | char jumpname1[32]; /*Flawfinder: ignore*/ | 8893 | char jumpname1[32]; /*Flawfinder: ignore*/ |
8894 | snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 8894 | ll_snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
8895 | char jumpname2[32]; /*Flawfinder: ignore*/ | 8895 | char jumpname2[32]; /*Flawfinder: ignore*/ |
8896 | snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 8896 | ll_snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
8897 | 8897 | ||
8898 | mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); | 8898 | mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); |
8899 | chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]); | 8899 | chunk->addByte(LSCRIPTOpCodes[LOPC_JUMPNIF]); |
@@ -8996,9 +8996,9 @@ void LLScriptFor::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePass | |||
8996 | case LSCP_EMIT_BYTE_CODE: | 8996 | case LSCP_EMIT_BYTE_CODE: |
8997 | { | 8997 | { |
8998 | char jumpname1[32]; /*Flawfinder: ignore*/ | 8998 | char jumpname1[32]; /*Flawfinder: ignore*/ |
8999 | snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 8999 | ll_snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
9000 | char jumpname2[32]; /*Flawfinder: ignore*/ | 9000 | char jumpname2[32]; /*Flawfinder: ignore*/ |
9001 | snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 9001 | ll_snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
9002 | 9002 | ||
9003 | if(mSequence) | 9003 | if(mSequence) |
9004 | mSequence->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); | 9004 | mSequence->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); |
@@ -9095,7 +9095,7 @@ void LLScriptDoWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompileP | |||
9095 | case LSCP_EMIT_BYTE_CODE: | 9095 | case LSCP_EMIT_BYTE_CODE: |
9096 | { | 9096 | { |
9097 | char jumpname1[32]; /*Flawfinder: ignore*/ | 9097 | char jumpname1[32]; /*Flawfinder: ignore*/ |
9098 | snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 9098 | ll_snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
9099 | 9099 | ||
9100 | chunk->addLabel(jumpname1); | 9100 | chunk->addLabel(jumpname1); |
9101 | mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); | 9101 | mStatement->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); |
@@ -9171,9 +9171,9 @@ void LLScriptWhile::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCompilePas | |||
9171 | case LSCP_EMIT_BYTE_CODE: | 9171 | case LSCP_EMIT_BYTE_CODE: |
9172 | { | 9172 | { |
9173 | char jumpname1[32]; /*Flawfinder: ignore*/ | 9173 | char jumpname1[32]; /*Flawfinder: ignore*/ |
9174 | snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 9174 | ll_snprintf(jumpname1, sizeof(jumpname1), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
9175 | char jumpname2[32]; /*Flawfinder: ignore*/ | 9175 | char jumpname2[32]; /*Flawfinder: ignore*/ |
9176 | snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ | 9176 | ll_snprintf(jumpname2, sizeof(jumpname2), "##Temp Jump %d##", gTempJumpCount++); /* Flawfinder: ignore */ |
9177 | 9177 | ||
9178 | chunk->addLabel(jumpname1); | 9178 | chunk->addLabel(jumpname1); |
9179 | mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); | 9179 | mExpression->recurse(fp, tabs, tabsize, LSCP_TO_STACK, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); |