From 921ac8d6dde6df60cce9346232762794fb9efa05 Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Thu, 2 Dec 2010 21:20:30 +0000
Subject: Change the gcc options for sdl builds to allow for gnu99 features, it
 needs some fixes in other places. Fixes test_mem compilation failure on
 cygwin.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28723 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/doom/z_zone.c | 2 +-
 apps/plugins/mp3_encoder.c | 2 +-
 apps/plugins/test_disk.c   | 2 +-
 apps/plugins/test_mem.c    | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'apps/plugins')

diff --git a/apps/plugins/doom/z_zone.c b/apps/plugins/doom/z_zone.c
index 1d0ac5b..adf17a7 100644
--- a/apps/plugins/doom/z_zone.c
+++ b/apps/plugins/doom/z_zone.c
@@ -248,7 +248,7 @@ void Z_Init(void)
 
    zonebase_size=size;
 
-   printf("Z_Init: Allocated %dKb zone memory\n", (long unsigned)size >> 10);
+   printf("Z_Init: Allocated %uldKb zone memory\n", (long unsigned)(size >> 10));
 
    // Align on cache boundary
 
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index c0b0252..bdfb4d8 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -903,7 +903,7 @@ int read_samples(uint32_t *buffer, int num_samples)
   return samples;
 }
 
-inline uint32_t myswap32(uint32_t val)
+static inline uint32_t myswap32(uint32_t val)
 {
   const uint8_t* v = (const uint8_t*)&val;
 
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index afb25da..dd0758a 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -434,7 +434,7 @@ enum plugin_status plugin_start(const void* parameter)
 
     audiobuf = rb->plugin_get_audio_buffer(&audiobuflen);
     /* align start and length to 32 bit */
-    align = (-(int)audiobuf) & 3;
+    align = (-(intptr_t)audiobuf) & 3;
     audiobuf += align;
     audiobuflen = (audiobuflen - align) & ~3;
 
diff --git a/apps/plugins/test_mem.c b/apps/plugins/test_mem.c
index 0d9729f..2530982 100644
--- a/apps/plugins/test_mem.c
+++ b/apps/plugins/test_mem.c
@@ -188,7 +188,9 @@ enum plugin_status plugin_start(const void* parameter)
 {
     (void)parameter;
     bool done = false;
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
     bool boost = false;
+#endif
     int count = 0;
 
 #ifdef HAVE_LCD_BITMAP
@@ -204,7 +206,7 @@ enum plugin_status plugin_start(const void* parameter)
         line = 0;
         int ret;
         rb->screens[0]->clear_display();
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
         TEST_MEM_PRINTF("%s", boost?"boosted":"unboosted");
         TEST_MEM_PRINTF("clock: %d Hz", *rb->cpu_frequency);
 #endif
-- 
cgit v1.1