comparison src/bytecode.c @ 4970:5c89ceb69819

fix compile problems -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-04 Ben Wing <ben@xemacs.org> * bytecode.c (assert_failed_with_remembered_ops): * bytecode.c (init_opcode_table_multi_op): Declare some things const to shut up G++ v4 warnings. * redisplay.c (add_ibyte_string_runes): * redisplay.c (add_string_to_fstring_db_runes): * redisplay.c (generate_fstring_runes): * redisplay.c (window_line_number): * redisplay.c (decode_mode_spec): Use Ascbyte instead of char in various places.
author Ben Wing <ben@xemacs.org>
date Thu, 04 Feb 2010 05:39:00 -0600
parents cbe181529c34
children fe0d3106cc36
comparison
equal deleted inserted replaced
4969:cbe181529c34 4970:5c89ceb69819
153 num_remembered++; 153 num_remembered++;
154 } 154 }
155 155
156 static void 156 static void
157 assert_failed_with_remembered_ops (const Ascbyte *file, int line, 157 assert_failed_with_remembered_ops (const Ascbyte *file, int line,
158 Ascbyte *msg_to_abort_with) 158 const Ascbyte *msg_to_abort_with)
159 { 159 {
160 Ascbyte *msg = 160 Ascbyte *msg =
161 alloca_array (Ascbyte, 161 alloca_array (Ascbyte,
162 NUM_REMEMBERED_BYTE_OPS*50 + strlen (msg_to_abort_with)); 162 NUM_REMEMBERED_BYTE_OPS*50 + strlen (msg_to_abort_with));
163 int i; 163 int i;
182 sprintf (msg2, "constant+%d", op - Bconstant); 182 sprintf (msg2, "constant+%d", op - Bconstant);
183 strcat (msg, msg2); 183 strcat (msg, msg2);
184 } 184 }
185 else 185 else
186 { 186 {
187 Ascbyte *opname = opcode_name_table[op]; 187 const Ascbyte *opname = opcode_name_table[op];
188 if (!opname) 188 if (!opname)
189 { 189 {
190 stderr_out ("Internal error! NULL pointer in opcode_name_table, opcode %d\n", op); 190 stderr_out ("Internal error! NULL pointer in opcode_name_table, opcode %d\n", op);
191 strcat (msg, "NULL"); 191 strcat (msg, "NULL");
192 } 192 }
2815 plus an offset (except for Bconstant). */ 2815 plus an offset (except for Bconstant). */
2816 2816
2817 static void 2817 static void
2818 init_opcode_table_multi_op (Opcode op) 2818 init_opcode_table_multi_op (Opcode op)
2819 { 2819 {
2820 Ascbyte *basename = opcode_name_table[op]; 2820 const Ascbyte *basename = opcode_name_table[op];
2821 Ascbyte temp[300]; 2821 Ascbyte temp[300];
2822 int i; 2822 int i;
2823 2823
2824 for (i = 1; i < 7; i++) 2824 for (i = 1; i < 7; i++)
2825 { 2825 {