From dcd65c02b597974721bec92180ec8d522a04cab2 Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Sat, 20 Oct 2012 20:24:56 +0200 Subject: build fixes --- src/keeper.c | 35 ++++++++++++++++++----------------- src/threading.c | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/keeper.c b/src/keeper.c index 83ec8f3..ba4b8ed 100644 --- a/src/keeper.c +++ b/src/keeper.c @@ -186,28 +186,29 @@ static void push_table( lua_State* L, int idx) int keeper_push_linda_storage( lua_State* L, void* ptr) { struct s_Keeper* K = keeper_acquire( ptr); - STACK_CHECK( K->L) - lua_pushlightuserdata( K->L, fifos_key); // fifos_key - lua_rawget( K->L, LUA_REGISTRYINDEX); // fifos - lua_pushlightuserdata( K->L, ptr); // fifos ud - lua_rawget( K->L, -2); // fifos storage - lua_remove( K->L, -2); // storage - if( !lua_istable( K->L, -1)) + lua_State* KL = K->L; + STACK_CHECK( KL) + lua_pushlightuserdata( KL, fifos_key); // fifos_key + lua_rawget( KL, LUA_REGISTRYINDEX); // fifos + lua_pushlightuserdata( KL, ptr); // fifos ud + lua_rawget( KL, -2); // fifos storage + lua_remove( KL, -2); // storage + if( !lua_istable( KL, -1)) { - lua_pop( K->L, 1); // - STACK_MID( K->L, 0); + lua_pop( KL, 1); // + STACK_MID( KL, 0); return 0; } - lua_pushnil( K->L); // storage nil + lua_pushnil( KL); // storage nil lua_newtable( L); // out - while( lua_next( K->L, -2)) // storage key fifo + while( lua_next( KL, -2)) // storage key fifo { - keeper_fifo* fifo = prepare_fifo_access( K->L, -1); // storage key fifo - lua_pushvalue( K->L, -2); // storage key fifo key - luaG_inter_move( K->L, L, 1); // storage key fifo // out key + keeper_fifo* fifo = prepare_fifo_access( KL, -1); // storage key fifo + lua_pushvalue( KL, -2); // storage key fifo key + luaG_inter_move( KL, L, 1); // storage key fifo // out key STACK_CHECK( L) lua_newtable( L); // out key keyout - luaG_inter_move( K->L, L, 1); // storage key // out key keyout fifo + luaG_inter_move( KL, L, 1); // storage key // out key keyout fifo lua_pushinteger( L, fifo->first); // out key keyout fifo first lua_setfield( L, -3, "first"); // out key keyout fifo lua_pushinteger( L, fifo->count); // out key keyout fifo count @@ -218,8 +219,8 @@ int keeper_push_linda_storage( lua_State* L, void* ptr) lua_rawset( L, -3); // out STACK_END( L, 0) } - lua_pop( K->L, 1); // - STACK_END( K->L, 0) + lua_pop( KL, 1); // + STACK_END( KL, 0) keeper_release( K); return 1; } diff --git a/src/threading.c b/src/threading.c index 3bcf6cd..edfae90 100644 --- a/src/threading.c +++ b/src/threading.c @@ -778,7 +778,7 @@ bool_t THREAD_WAIT( THREAD_T *ref, double secs , SIGNAL_T *signal_ref, MUTEX_T * #if defined PLATFORM_BSD pthread_set_name_np( pthread_self(), _name); #elif defined PLATFORM_LINUX || defined PLATFORM_QNX || defined PLATFORM_CYGWIN - pthread_setname_np(_name pthread_self(), _name); + pthread_setname_np( pthread_self(), _name); #elif defined PLATFORM_OSX pthread_setname_np(_name); #elif defined PLATFORM_WIN32 || defined PLATFORM_POCKETPC -- cgit v1.2.3-55-g6feb