summaryrefslogtreecommitdiffstats
path: root/apps/plugins
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2010-05-14 12:43:45 +0000
committerThomas Martitz <kugel@rockbox.org>2010-05-14 12:43:45 +0000
commit68947473e11ec9ac97f00fa5c70cee820753be90 (patch)
treeefe51f0174cc2f9b2e7aa8d309ae3ad0f076877c /apps/plugins
parent3cca7e865082c8144a47687e3a2455fba5a927d5 (diff)
downloadrockbox-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
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/calculator.c3
-rw-r--r--apps/plugins/lua/rockconf.h7
2 files changed, 8 insertions, 2 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 "="
PLUGIN_HEADER
+
+#define M_TWOPI (M_PI * 2.0)
+
#define BUTTON_ROWS 5
#define BUTTON_COLS 5
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);
long strtol(const char *nptr, char **endptr, int base);
unsigned long strtoul(const char *str, char **endptr, int base);
size_t strftime(char* dst, size_t max, const char* format, const struct tm* tm);
-long floor(long x);
-long pow(long x, long y);
+long lfloor(long x);
+long lpow(long x, long y);
+
+#define floor lfloor
+#define pow lpow
/* Simple substitutions */
#define realloc dlrealloc