From 44540b9335f3bbd2f6fda3e13329b28ec76b6d7a Mon Sep 17 00:00:00 2001
From: Benoit Germain <b n t DOT g e r m a i n AT g m a i l DOT c o m>
Date: Fri, 11 Oct 2013 20:08:32 +0200
Subject: version 3.7.0

* fix lanes.threads() not being available in a lane where
lanes.configure() settings didn't contain track_lanes although the
initial configure() call did.
* require "lanes".configure() sequence is only necessary at the first
require "lanes".
* fix a crash at application shutdown where in some situations we could
deinitialize the protected allocator mutex while a lane was still using
it.
* fix timers broken by change 69
---
 src/tools.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/tools.h')

diff --git a/src/tools.h b/src/tools.h
index 1113131..6d3b3c7 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -56,7 +56,8 @@ extern int debugspew_indent_depth;
   #define STACK_END(L,c)    /*nothing*/
   #define STACK_DUMP(L)    /*nothing*/
 #else
-  #define _ASSERT_L(lua,c)  do { if (!(c)) luaL_error( lua, "ASSERT failed: %s:%d '%s'", __FILE__, __LINE__, #c ); } while( 0)
+  void ASSERT_IMPL( lua_State* L, bool_t cond_, char const* file_, int const line_, char const* text_);
+  #define _ASSERT_L(lua,c) ASSERT_IMPL( lua, (c) != 0, __FILE__, __LINE__, #c)
   //
   #define STACK_CHECK(L)     { int const _oldtop_##L = lua_gettop( L)
   #define STACK_MID(L,change) \
@@ -75,7 +76,7 @@ extern int debugspew_indent_depth;
 
 #define STACK_GROW(L,n) do { if (!lua_checkstack(L,n)) luaL_error( L, "Cannot grow stack!" ); } while( 0)
 
-#define LUAG_FUNC( func_name ) static int LG_##func_name( lua_State *L )
+#define LUAG_FUNC( func_name ) static int LG_##func_name( lua_State* L)
 
 #define luaG_optunsigned(L,i,d) ((uint_t) luaL_optinteger(L,i,d))
 #define luaG_tounsigned(L,i) ((uint_t) lua_tointeger(L,i))
@@ -83,6 +84,7 @@ extern int debugspew_indent_depth;
 void luaG_dump( lua_State* L );
 
 lua_State* luaG_newstate( lua_State* _from, int const _on_state_create, char const* libs);
+void luaG_copy_one_time_settings( lua_State* L, lua_State* L2, char const* name_);
 
 typedef struct {
     volatile int refcount;
@@ -117,5 +119,7 @@ extern MUTEX_T require_cs;
 // for verbose errors
 extern bool_t GVerboseErrors;
 
-#endif
-    // TOOLS_H
+char const* const CONFIG_REGKEY;
+char const* const LOOKUP_REGKEY;
+
+#endif // TOOLS_H
-- 
cgit v1.2.3-55-g6feb