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

diff --git a/hw/dma.c b/hw/dma.c
index bbdecc5..00c6332 100644 (file)
--- a/hw/dma.c
+++ b/hw/dma.c
@@ -450,7 +450,7 @@ static int dma_phony_handler (void *opaque, int nchan, int dma_pos, int dma_len)
 static void dma_init2(struct dma_cont *d, int base, int dshift,
                       int page_base, int pageh_base)
 {
-    const int page_port_list[] = { 0x1, 0x2, 0x3, 0x7 };
+    static const int page_port_list[] = { 0x1, 0x2, 0x3, 0x7 };
     int i;
 
     d->dshift = dshift;

diff --git a/target-i386/translate.c b/target-i386/translate.c
index f7313ea..bfb2801 100644 (file)
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -5475,7 +5475,7 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
             case 0x18 ... 0x1b:
                 {
                     int op1, l1;
-                    const static uint8_t fcmov_cc[8] = {
+                    static const uint8_t fcmov_cc[8] = {
                         (JCC_B << 1),
                         (JCC_Z << 1),
                         (JCC_BE << 1),