diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:46:06 +0200 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2014-04-02 20:46:06 +0200 |
commit | bfd0179042b0b02fb88748d54e56e7e208bb117f (patch) | |
tree | 42d5fd51574054caaf673420fca1ec962d62d2f2 /apps/plugins/lua/lstring.h | |
parent | 36378988ad4059982742f05f5eb50580b456840a (diff) | |
download | rockbox-bfd0179042b0b02fb88748d54e56e7e208bb117f.tar.gz rockbox-bfd0179042b0b02fb88748d54e56e7e208bb117f.zip |
Revert "Update lua plugin to 5.2.3"
FILE typedef to *void needs more work to not break sim and
application builds. I checked only a few random native builds
unfortunately. Sorry for inconvenience.
Diffstat (limited to 'apps/plugins/lua/lstring.h')
-rw-r--r-- | apps/plugins/lua/lstring.h | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/apps/plugins/lua/lstring.h b/apps/plugins/lua/lstring.h index 260e7f169b..c88e4c12a9 100644 --- a/apps/plugins/lua/lstring.h +++ b/apps/plugins/lua/lstring.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lstring.h,v 1.49.1.1 2013/04/12 18:48:47 roberto Exp $ | 2 | ** $Id$ |
3 | ** String table (keep all strings handled by Lua) | 3 | ** String table (keep all strings handled by Lua) |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -7,6 +7,7 @@ | |||
7 | #ifndef lstring_h | 7 | #ifndef lstring_h |
8 | #define lstring_h | 8 | #define lstring_h |
9 | 9 | ||
10 | |||
10 | #include "lgc.h" | 11 | #include "lgc.h" |
11 | #include "lobject.h" | 12 | #include "lobject.h" |
12 | #include "lstate.h" | 13 | #include "lstate.h" |
@@ -16,31 +17,15 @@ | |||
16 | 17 | ||
17 | #define sizeudata(u) (sizeof(union Udata)+(u)->len) | 18 | #define sizeudata(u) (sizeof(union Udata)+(u)->len) |
18 | 19 | ||
20 | #define luaS_new(L, s) (luaS_newlstr(L, s, strlen(s))) | ||
19 | #define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \ | 21 | #define luaS_newliteral(L, s) (luaS_newlstr(L, "" s, \ |
20 | (sizeof(s)/sizeof(char))-1)) | 22 | (sizeof(s)/sizeof(char))-1)) |
21 | 23 | ||
22 | #define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) | 24 | #define luaS_fix(s) l_setbit((s)->tsv.marked, FIXEDBIT) |
23 | 25 | ||
24 | |||
25 | /* | ||
26 | ** test whether a string is a reserved word | ||
27 | */ | ||
28 | #define isreserved(s) ((s)->tsv.tt == LUA_TSHRSTR && (s)->tsv.extra > 0) | ||
29 | |||
30 | |||
31 | /* | ||
32 | ** equality for short strings, which are always internalized | ||
33 | */ | ||
34 | #define eqshrstr(a,b) check_exp((a)->tsv.tt == LUA_TSHRSTR, (a) == (b)) | ||
35 | |||
36 | |||
37 | LUAI_FUNC unsigned int luaS_hash (const char *str, size_t l, unsigned int seed); | ||
38 | LUAI_FUNC int luaS_eqlngstr (TString *a, TString *b); | ||
39 | LUAI_FUNC int luaS_eqstr (TString *a, TString *b); | ||
40 | LUAI_FUNC void luaS_resize (lua_State *L, int newsize); | 26 | LUAI_FUNC void luaS_resize (lua_State *L, int newsize); |
41 | LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); | 27 | LUAI_FUNC Udata *luaS_newudata (lua_State *L, size_t s, Table *e); |
42 | LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); | 28 | LUAI_FUNC TString *luaS_newlstr (lua_State *L, const char *str, size_t l); |
43 | LUAI_FUNC TString *luaS_new (lua_State *L, const char *str); | ||
44 | 29 | ||
45 | 30 | ||
46 | #endif | 31 | #endif |