Commit d70040bcae822db0515eae055f1842164c2697a9

Authored by pbrook
1 parent cea9d0b3

Re-add static qualifier. Fix annother occurance of "const static".


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4850 c046a42c-6fe2-441c-8c8c-71466251a162
hw/dma.c
@@ -450,7 +450,7 @@ static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len) @@ -450,7 +450,7 @@ static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
450 static void dma_init2(struct dma_cont *d, int base, int dshift, 450 static void dma_init2(struct dma_cont *d, int base, int dshift,
451 int page_base, int pageh_base) 451 int page_base, int pageh_base)
452 { 452 {
453 - const int page_port_list[] = { 0x1, 0x2, 0x3, 0x7 }; 453 + static const int page_port_list[] = { 0x1, 0x2, 0x3, 0x7 };
454 int i; 454 int i;
455 455
456 d->dshift = dshift; 456 d->dshift = dshift;
target-i386/translate.c
@@ -5475,7 +5475,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start) @@ -5475,7 +5475,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
5475 case 0x18 ... 0x1b: 5475 case 0x18 ... 0x1b:
5476 { 5476 {
5477 int op1, l1; 5477 int op1, l1;
5478 - const static uint8_t fcmov_cc[8] = { 5478 + static const uint8_t fcmov_cc[8] = {
5479 (JCC_B << 1), 5479 (JCC_B << 1),
5480 (JCC_Z << 1), 5480 (JCC_Z << 1),
5481 (JCC_BE << 1), 5481 (JCC_BE << 1),