lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

update sproto

Browse Source
This commit is contained in:
Cloud Wu
2017-10-18 10:02:59 +08:00
parent c4c429b699
commit ece075ef6e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lualib-src/sproto/lsproto.c
View File

@@ -44,10 +44,10 @@ LUALIB_API void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
#if LUA_VERSION_NUM < 503 #if LUA_VERSION_NUM < 503
#if LUA_VERSION_NUM < 502 #if LUA_VERSION_NUM < 502
static lua_Integer lua_tointegerx(lua_State *L, int idx, int *isnum) { static int64_t lua_tointegerx(lua_State *L, int idx, int *isnum) {
if (lua_isnumber(L, idx)) { if (lua_isnumber(L, idx)) {
if (isnum) *isnum = 1; if (isnum) *isnum = 1;
return lua_tointeger(L, idx); return (int64_t)lua_tointeger(L, idx);
} }
else { else {
if (isnum) *isnum = 0; if (isnum) *isnum = 0;
@@ -165,13 +165,14 @@ encode(const struct sproto_arg *args) {
} }
switch (args->type) { switch (args->type) {
case SPROTO_TINTEGER: { case SPROTO_TINTEGER: {
lua_Integer v; int64_t v;
lua_Integer vh; lua_Integer vh;
int isnum; int isnum;
if (args->extra) { if (args->extra) {
// It's decimal. // It's decimal.
lua_Number vn = lua_tonumber(L, -1); lua_Number vn = lua_tonumber(L, -1);
v = (lua_Integer)(vn * args->extra + 0.5); // use 64bit integer for 32bit architecture.
v = (int64_t)(vn * args->extra + 0.5);
} else { } else {
v = lua_tointegerx(L, -1, &isnum); v = lua_tointegerx(L, -1, &isnum);
if(!isnum) { if(!isnum) {
@@ -349,7 +350,7 @@ decode(const struct sproto_arg *args) {
vn /= args->extra; vn /= args->extra;
lua_pushnumber(L, vn); lua_pushnumber(L, vn);
} else { } else {
lua_Integer v = *(int64_t*)args->value; int64_t v = *(int64_t*)args->value;
lua_pushinteger(L, v); lua_pushinteger(L, v);
} }
break; break;