diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-05-14 12:43:45 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-05-14 12:43:45 +0000 |
commit | 68947473e11ec9ac97f00fa5c70cee820753be90 (patch) | |
tree | efe51f0174cc2f9b2e7aa8d309ae3ad0f076877c | |
parent | 3cca7e865082c8144a47687e3a2455fba5a927d5 (diff) | |
download | rockbox-68947473e11ec9ac97f00fa5c70cee820753be90.tar.gz rockbox-68947473e11ec9ac97f00fa5c70cee820753be90.zip |
Move math.h to firmware/libc/include/ and fix slight incompatibilities between our and the host's math.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26020 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/calculator.c | 3 | ||||
-rw-r--r-- | apps/plugins/lua/rockconf.h | 7 | ||||
-rw-r--r-- | firmware/libc/include/math.h (renamed from firmware/include/math.h) | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index c19d6bbc5b..95b35e903c 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -80,6 +80,9 @@ F3: equal to "=" | |||
80 | 80 | ||
81 | PLUGIN_HEADER | 81 | PLUGIN_HEADER |
82 | 82 | ||
83 | |||
84 | #define M_TWOPI (M_PI * 2.0) | ||
85 | |||
83 | #define BUTTON_ROWS 5 | 86 | #define BUTTON_ROWS 5 |
84 | #define BUTTON_COLS 5 | 87 | #define BUTTON_COLS 5 |
85 | 88 | ||
diff --git a/apps/plugins/lua/rockconf.h b/apps/plugins/lua/rockconf.h index 92c0f8cac8..7fbc89f166 100644 --- a/apps/plugins/lua/rockconf.h +++ b/apps/plugins/lua/rockconf.h | |||
@@ -51,8 +51,11 @@ struct tm *gmtime(const time_t *timep); | |||
51 | long strtol(const char *nptr, char **endptr, int base); | 51 | long strtol(const char *nptr, char **endptr, int base); |
52 | unsigned long strtoul(const char *str, char **endptr, int base); | 52 | unsigned long strtoul(const char *str, char **endptr, int base); |
53 | size_t strftime(char* dst, size_t max, const char* format, const struct tm* tm); | 53 | size_t strftime(char* dst, size_t max, const char* format, const struct tm* tm); |
54 | long floor(long x); | 54 | long lfloor(long x); |
55 | long pow(long x, long y); | 55 | long lpow(long x, long y); |
56 | |||
57 | #define floor lfloor | ||
58 | #define pow lpow | ||
56 | 59 | ||
57 | /* Simple substitutions */ | 60 | /* Simple substitutions */ |
58 | #define realloc dlrealloc | 61 | #define realloc dlrealloc |
diff --git a/firmware/include/math.h b/firmware/libc/include/math.h index 5415e43f86..07f1f2d686 100644 --- a/firmware/include/math.h +++ b/firmware/libc/include/math.h | |||
@@ -29,7 +29,6 @@ extern "C" { | |||
29 | #define M_LN2 0.69314718055994530942 | 29 | #define M_LN2 0.69314718055994530942 |
30 | #define M_LN10 2.30258509299404568402 | 30 | #define M_LN10 2.30258509299404568402 |
31 | #define M_PI 3.14159265358979323846 | 31 | #define M_PI 3.14159265358979323846 |
32 | #define M_TWOPI (M_PI * 2.0) | ||
33 | #define M_PI_2 1.57079632679489661923 | 32 | #define M_PI_2 1.57079632679489661923 |
34 | #define M_PI_4 0.78539816339744830962 | 33 | #define M_PI_4 0.78539816339744830962 |
35 | #define M_3PI_4 2.3561944901923448370E0 | 34 | #define M_3PI_4 2.3561944901923448370E0 |