From 78d29f535ff14a5f213125baf63fa2961be17d79 Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Wed, 26 Mar 2008 23:35:34 +0000
Subject: Major cleanup of checkwps - fix all warnings and add a script to
 build versions for all supported targets (plus some unsupported ones).  You
 now need to run the version of checkwps that matches the device your WPS is
 for.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16831 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/gwps-common.c |  1 +
 apps/gui/gwps.h        |  1 -
 apps/gui/wps_parser.c  |  3 ++-
 apps/misc.c            | 12 ++++++------
 apps/recorder/bmp.c    |  2 +-
 apps/root_menu.c       |  1 +
 6 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'apps')

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 37b2b7c5d1..a6bb917a5a 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -53,6 +53,7 @@
 #include "dsp.h"
 #include "action.h"
 #include "cuesheet.h"
+#include "playlist.h"
 
 #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index b24c243cd7..127fd99511 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -22,7 +22,6 @@
 #include "screen_access.h"
 #include "statusbar.h"
 #include "id3.h"
-#include "playlist.h"
 
 /* constants used in line_type and as refresh_mode for wps_refresh */
 #define WPS_REFRESH_STATIC          1    /* line doesn't change over time */
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index e8c3c9f629..9bbdb2e5d0 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -20,6 +20,8 @@
 #include <stdio.h>
 #include <string.h>
 #include "gwps.h"
+#include "file.h"
+#include "misc.h"
 #ifdef __PCTOOL__
 #define DEBUGF printf
 #define FONT_SYSFIXED 0
@@ -39,7 +41,6 @@
 #include "atoi.h"
 #include "gwps.h"
 #include "settings.h"
-#include "misc.h"
 #include "plugin.h"
 
 #ifdef HAVE_LCD_BITMAP
diff --git a/apps/misc.c b/apps/misc.c
index 1ce65c0108..1d83640dc4 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -18,14 +18,16 @@
  ****************************************************************************/
 #include <stdlib.h>
 #include <ctype.h>
+#include "config.h"
+#include "lcd.h"
+#include "file.h"
+#ifdef __PCTOOL__
+#include <stdarg.h>
+#else
 #include "sprintf.h"
-#ifndef __PCTOOL__
 #include "lang.h"
 #include "string.h"
-#include "config.h"
-#include "file.h"
 #include "dir.h"
-#include "lcd.h"
 #include "lcd-remote.h"
 #include "errno.h"
 #include "system.h"
@@ -49,7 +51,6 @@
 #include "tagcache.h"
 #include "scrobbler.h"
 #include "sound.h"
-#endif
 
 #ifdef HAVE_MMC
 #include "ata_mmc.h"
@@ -77,7 +78,6 @@
 #endif
 #endif
 
-#ifndef __PCTOOL__
 /* Format a large-range value for output, using the appropriate unit so that
  * the displayed value is in the range 1 <= display < 1000 (1024 for "binary"
  * units) if possible, and 3 significant digits are shown. If a buffer is
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index f844c8908f..e2d5713aa5 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -35,11 +35,11 @@
 #include "inttypes.h"
 #include "debug.h"
 #include "lcd.h"
+#include "file.h"
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
 #endif
 #ifndef __PCTOOL__
-#include "file.h"
 #include "config.h"
 #include "system.h"
 #include "bmp.h"
diff --git a/apps/root_menu.c b/apps/root_menu.c
index ae7f92fc9b..281a528574 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -59,6 +59,7 @@
 #endif
 #include "gwps-common.h"
 #include "bookmark.h"
+#include "playlist.h"
 #include "tagtree.h"
 #include "menus/exported_menus.h"
 #ifdef HAVE_RTC_ALARM
-- 
cgit v1.2.3