diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 21:04:40 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-06 21:04:40 +0000 |
commit | 50a6ca39ad4ed01922aa4f755f0ca579788226cf (patch) | |
tree | c7881b015b220558167310345b162324c96be15a /apps/plugins/frotz | |
parent | adb506df14aded06ed6e9ebf8540e6fd383ffd6a (diff) | |
download | rockbox-50a6ca39ad4ed01922aa4f755f0ca579788226cf.tar.gz rockbox-50a6ca39ad4ed01922aa4f755f0ca579788226cf.zip |
Move c/h files implementing/defining standard library stuff into a new libc directory, also standard'ify some parts of the code base (almost entirely #include fixes).
This is to a) to cleanup firmware/common and firmware/include a bit, but also b) for Rockbox as an application which should use the host system's c library and headers, separating makes it easy to exclude our files from the build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25850 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/frotz')
-rw-r--r-- | apps/plugins/frotz/frotz.c | 6 | ||||
-rw-r--r-- | apps/plugins/frotz/frotzplugin.h | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/apps/plugins/frotz/frotz.c b/apps/plugins/frotz/frotz.c index 96029b85cb..f64431f14e 100644 --- a/apps/plugins/frotz/frotz.c +++ b/apps/plugins/frotz/frotz.c | |||
@@ -285,14 +285,14 @@ void os_beep(int volume) | |||
285 | static unsigned char unget_buf; | 285 | static unsigned char unget_buf; |
286 | static int unget_file; | 286 | static int unget_file; |
287 | 287 | ||
288 | int ungetc(int c, int f) | 288 | int frotz_ungetc(int c, int f) |
289 | { | 289 | { |
290 | unget_file = f; | 290 | unget_file = f; |
291 | unget_buf = c; | 291 | unget_buf = c; |
292 | return c; | 292 | return c; |
293 | } | 293 | } |
294 | 294 | ||
295 | int fgetc(int f) | 295 | int frotz_fgetc(int f) |
296 | { | 296 | { |
297 | unsigned char cb; | 297 | unsigned char cb; |
298 | if (unget_file == f) | 298 | if (unget_file == f) |
@@ -305,7 +305,7 @@ int fgetc(int f) | |||
305 | return cb; | 305 | return cb; |
306 | } | 306 | } |
307 | 307 | ||
308 | int fputc(int c, int f) | 308 | int frotz_fputc(int c, int f) |
309 | { | 309 | { |
310 | unsigned char cb = c; | 310 | unsigned char cb = c; |
311 | if (rb->write(f, &cb, 1) != 1) | 311 | if (rb->write(f, &cb, 1) != 1) |
diff --git a/apps/plugins/frotz/frotzplugin.h b/apps/plugins/frotz/frotzplugin.h index 8caddb470d..1a52bdb913 100644 --- a/apps/plugins/frotz/frotzplugin.h +++ b/apps/plugins/frotz/frotzplugin.h | |||
@@ -37,9 +37,12 @@ | |||
37 | /* | 37 | /* |
38 | * we need functions for character io | 38 | * we need functions for character io |
39 | */ | 39 | */ |
40 | extern int ungetc(int c, int f); | 40 | extern int frotz_ungetc(int c, int f); |
41 | extern int fgetc(int f); | 41 | #define ungetc frotz_ungetc |
42 | extern int fputc(int c, int f); | 42 | extern int frotz_fgetc(int f); |
43 | #define fgetc frotz_fgetc | ||
44 | extern int frotz_fputc(int c, int f); | ||
45 | #define fputc frotz_fputc | ||
43 | 46 | ||
44 | /* | 47 | /* |
45 | * this is used instead of os_read_key for more prompts and the like | 48 | * this is used instead of os_read_key for more prompts and the like |