Remove c99isms. Fix Makefile glitch where optimisation was accidentally turned

off.

diff --git a/Makefile b/Makefile
index d3057fe..d77bdfa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ BUILDDIR = $(ACK_TEMP_DIR)/ack-build
 
 # What build flags do you want to use for native code?
 
-CFLAGS = -g -Wno-return-type
+CFLAGS = -Os -g -Wno-return-type
 LDFLAGS = 
 
 # Various commands.

diff --git a/plat/pc86/emu/main.c b/plat/pc86/emu/main.c
index 1558884..f513122 100644 (file)
--- a/plat/pc86/emu/main.c
+++ b/plat/pc86/emu/main.c
@@ -96,6 +96,8 @@ static void int13_cb(int num)
 
 int main(int argc, const char* argv[])
 {
+       int i;
+
        if (argc != 2)
        {
                printk("syntax: pc86emu <fdimage.img>\n");
@@ -116,7 +118,7 @@ int main(int argc, const char* argv[])
 
        /* Load the boot sector at 0x07c0:0000. */
 
-       for (int i=0; i<512; i++)
+       for (i=0; i<512; i++)
        {
                uint8_t b;
                read(floppy_fd, &b, 1);
@@ -125,7 +127,7 @@ int main(int argc, const char* argv[])
 
        /* Initialise. */
 
-       for (int i=0; i<256; i++)
+       for (i=0; i<256; i++)
                intr_funcs[i] = unknown_interrupt_cb;
        intr_funcs[0x10] = int10_cb;
        intr_funcs[0x13] = int13_cb;