change local var names from "asm" to "assem" - I guess it caused

gcc 3.3.5 to break, but not tested it

diff --git a/src/mesa/shader/slang/slang_assemble.c b/src/mesa/shader/slang/slang_assemble.c
index d4f635cd0fb1fad88489ea7e0e7e48cddd54edf4..a9e2b07a51225a5f58001e4169cdb17fe8292156 100644 (file)
--- a/src/mesa/shader/slang/slang_assemble.c
+++ b/src/mesa/shader/slang/slang_assemble.c
@@ -40,12 +40,12 @@
 \r
 /* slang_assembly */\r
 \r
-static void slang_assembly_construct (slang_assembly *asm)\r
+static void slang_assembly_construct (slang_assembly *assem)\r
 {\r
-       asm->type = slang_asm_none;\r
+       assem->type = slang_asm_none;\r
 }\r
 \r
-static void slang_assembly_destruct (slang_assembly *asm)\r
+static void slang_assembly_destruct (slang_assembly *assem)\r
 {\r
 }\r
 \r
@@ -82,14 +82,14 @@ static int slang_assembly_file_push_new (slang_assembly_file *file)
 static int slang_assembly_file_push_general (slang_assembly_file *file, slang_assembly_type type,\r
        GLfloat literal, GLuint label, GLuint size)\r
 {\r
-       slang_assembly *asm;\r
+       slang_assembly *assem;\r
        if (!slang_assembly_file_push_new (file))\r
                return 0;\r
-       asm = file->code + file->count - 1;\r
-       asm->type = type;\r
-       asm->literal = literal;\r
-       asm->param[0] = label;\r
-       asm->param[1] = size;\r
+       assem = file->code + file->count - 1;\r
+       assem->type = type;\r
+       assem->literal = literal;\r
+       assem->param[0] = label;\r
+       assem->param[1] = size;\r
        return 1;\r
 }\r
 \r
@@ -673,11 +673,11 @@ int _slang_assemble_operation (slang_assembly_file *file, slang_operation *op, i
        slang_assembly_flow_control *flow, slang_assembly_name_space *space,\r
        slang_assembly_local_info *info, slang_assembly_stack_info *stk)\r
 {\r
-       unsigned int asm;\r
+       unsigned int assem;\r
 \r
        stk->swizzle_mask = 0;\r
 \r
-       asm = file->count;\r
+       assem = file->count;\r
        if (!slang_assembly_file_push_new (file))\r
                return 0;\r
 \r
@@ -725,15 +725,15 @@ int _slang_assemble_operation (slang_assembly_file *file, slang_operation *op, i
                }\r
                break;\r
        case slang_oper_break:\r
-               file->code[asm].type = slang_asm_jump;\r
-               file->code[asm].param[0] = flow->loop_end;\r
+               file->code[assem].type = slang_asm_jump;\r
+               file->code[assem].param[0] = flow->loop_end;\r
                break;\r
        case slang_oper_continue:\r
-               file->code[asm].type = slang_asm_jump;\r
-               file->code[asm].param[0] = flow->loop_start;\r
+               file->code[assem].type = slang_asm_jump;\r
+               file->code[assem].param[0] = flow->loop_start;\r
                break;\r
        case slang_oper_discard:\r
-               file->code[asm].type = slang_asm_discard;\r
+               file->code[assem].type = slang_asm_discard;\r
                if (!slang_assembly_file_push (file, slang_asm_exit))\r
                        return 0;\r
                break;\r
@@ -781,16 +781,16 @@ int _slang_assemble_operation (slang_assembly_file *file, slang_operation *op, i
        case slang_oper_void:\r
                break;\r
        case slang_oper_literal_bool:\r
-               file->code[asm].type = slang_asm_bool_push;\r
-               file->code[asm].literal = op->literal;\r
+               file->code[assem].type = slang_asm_bool_push;\r
+               file->code[assem].literal = op->literal;\r
                break;\r
        case slang_oper_literal_int:\r
-               file->code[asm].type = slang_asm_int_push;\r
-               file->code[asm].literal = op->literal;\r
+               file->code[assem].type = slang_asm_int_push;\r
+               file->code[assem].literal = op->literal;\r
                break;\r
        case slang_oper_literal_float:\r
-               file->code[asm].type = slang_asm_float_push;\r
-               file->code[asm].literal = op->literal;\r
+               file->code[assem].type = slang_asm_float_push;\r
+               file->code[assem].literal = op->literal;\r
                break;\r
        case slang_oper_identifier:\r
                {\r