diff options
| author | Dave Chapman <dave@dchapman.com> | 2008-08-28 12:49:38 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2008-08-28 12:49:38 +0000 |
| commit | a3a54503994bb6b29180b1edcac166f2bc6ea54a (patch) | |
| tree | cb3a26387d21515655792b489f6a3b31691ea9ae | |
| parent | 1f7b22bd373904c1c8a753d4aaed8e0655b4fb5a (diff) | |
| download | rockbox-a3a54503994bb6b29180b1edcac166f2bc6ea54a.zip rockbox-a3a54503994bb6b29180b1edcac166f2bc6ea54a.tar.gz rockbox-a3a54503994bb6b29180b1edcac166f2bc6ea54a.tar.bz2 rockbox-a3a54503994bb6b29180b1edcac166f2bc6ea54a.tar.xz | |
Get checkwps compiling again: Move the definitions of BOM and BOM_SIZE to misc.c (they are not used outside misc.c, so don't need to be in the .h), plus always include misc.h in misc.c (not needed to fix checkwps, but good practice), and add unistd.h when __PCTOOL_ is defined.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18358 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/misc.c | 6 | ||||
| -rw-r--r-- | apps/misc.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/apps/misc.c b/apps/misc.c index 401360d..f3a937f 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -21,11 +21,13 @@ #include <stdlib.h> #include <ctype.h> #include "config.h" +#include "misc.h" #include "lcd.h" #include "file.h" #ifdef __PCTOOL__ #include <stdint.h> #include <stdarg.h> +#include <unistd.h> #else #include "sprintf.h" #include "lang.h" @@ -71,7 +73,6 @@ #include "gui/gwps-common.h" #include "bookmark.h" -#include "misc.h" #include "playback.h" #ifdef BOOTFILE @@ -1183,6 +1184,9 @@ char *strip_extension(char* buffer, int buffer_size, const char *filename) * If the file is opened for writing and O_TRUNC is set, write a BOM to * the opened file and leave the file pointer set after the BOM. */ +#define BOM "\xef\xbb\xbf" +#define BOM_SIZE 3 + int open_utf8(const char* pathname, int flags) { int fd; diff --git a/apps/misc.h b/apps/misc.h index b5547ec..807f231 100644 --- a/apps/misc.h +++ b/apps/misc.h @@ -24,9 +24,6 @@ #include <stdbool.h> #include <inttypes.h> -#define BOM "\xef\xbb\xbf" -#define BOM_SIZE 3 - /* 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 |