Merge remote-tracking branch 'origin/master'v3.0.0

2 files changed, 4 insertions, 2 deletions

diff --git a/src/lanes.c b/src/lanes.c
index 40af6c0..676032a 100644
--- a/src/lanes.c
+++ b/src/lanes.c
@@ -1153,8 +1153,10 @@ static int selfdestruct_atexit( lua_State *L)
                 if( !THREAD_ISNULL( s->thread)) // can be NULL if previous 'soft' termination succeeded
                 {
                     THREAD_KILL( &s->thread);
-                    // make sure the thread is really stopped!
+#if THREADAPI == THREADAPI_PTHREAD
+                    // pthread: make sure the thread is really stopped!
                     THREAD_WAIT( &s->thread, -1, &s->done_signal_, &s->done_lock_, &s->status);
+#endif // THREADAPI == THREADAPI_PTHREAD
                 }
                 // NO lua_close() in this case because we don't know where execution of the state was interrupted
 #if THREADWAIT_METHOD == THREADWAIT_CONDVAR
diff --git a/src/lanes.lua b/src/lanes.lua
index 6ba0ef3..d56e05f 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -82,7 +82,7 @@ local pairs= assert( pairs )
 local tostring= assert( tostring )
 local error= assert( error )
 
-ABOUT= 
+lanes.ABOUT= 
 {
     author= "Asko Kauppi <akauppi@gmail.com>",
     description= "Running multiple Lua states in parallel",