Merge pull request #17 from LuaDist/550dd55b0e571577a4ca6ccc880738f1268adb57

merge commits from steve

3 files changed, 7 insertions, 45 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31883fa..c1973d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,37 +44,6 @@ IF(UNIX AND NOT CYGWIN)
   SET(LIBS pthread)
 ENDIF(UNIX AND NOT CYGWIN)
 
-IF(MINGW)
-#~      FIND_FILE(MSVCR80 NAMES msvcr80.dll msvcr90.dll)
-#~      SET(LIBS gcc ${MSVCR80})
-#~      IF(MSVC90)
-
-#~              from InstallRequiredSystemLibraries.cmake
-
-                IF(CMAKE_CL_64)
-                        SET(CMAKE_MSVC_ARCH amd64)
-                ELSE(CMAKE_CL_64)
-                        SET(CMAKE_MSVC_ARCH x86)
-                ENDIF(CMAKE_CL_64)
-
-                GET_FILENAME_COMPONENT(devenv_dir "${CMAKE_MAKE_PROGRAM}" PATH)
-                GET_FILENAME_COMPONENT(base_dir "${devenv_dir}/../.." ABSOLUTE)
-
-                # Find the runtime library redistribution directory.
-                FIND_PATH(MSVC90_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
-                PATHS
-                "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist"
-                "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]/../../VC/redist"
-                "${base_dir}/VC/redist"
-                )
-                SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT")
-                SET(LIBS gcc msvcr90 "${MSVC90_CRT_DIR}/msvcr90.dll")
-
-#~      ENDIF()
-
-ENDIF()
-
-
 
 
 TARGET_LINK_LIBRARIES(lua51-lanes ${LUA_LIBRARY} ${LIBS})
diff --git a/src/threading.h b/src/threading.h
index 7387764..b0a3db0 100644
--- a/src/threading.h
+++ b/src/threading.h
@@ -32,13 +32,6 @@ typedef int bool_t;
 
 typedef unsigned int uint_t;
 
-#if defined(PLATFORM_WIN32) && defined(__GNUC__)
-/* MinGW with MSVCR80.DLL */
-/* Do this BEFORE including time.h so that it is declaring _mktime32()
- * as it would have declared mktime().
- */
-# define mktime _mktime32
-#endif
 #include <time.h>
 
 /* Note: ERROR is a defined entity on Win32
@@ -79,7 +72,7 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
   typedef unsigned int THREAD_RETURN_T;
 
   #define SIGNAL_T HANDLE
-  
+
   #define YIELD() Sleep(0)
         #define THREAD_CALLCONV __stdcall
 #else // THREADAPI == THREADAPI_PTHREAD
@@ -110,7 +103,7 @@ enum e_status { PENDING, RUNNING, WAITING, DONE, ERROR_ST, CANCELLED };
   typedef pthread_cond_t SIGNAL_T;
 
   void SIGNAL_ONE( SIGNAL_T *ref );
-  
+
   // Yield is non-portable:
   //
   //    OS X 10.4.8/9 has pthread_yield_np()
@@ -154,7 +147,7 @@ bool_t SIGNAL_WAIT( SIGNAL_T *ref, MUTEX_T *mu, time_d timeout );
   void THREAD_CREATE( THREAD_T *ref,
                       THREAD_RETURN_T (__stdcall *func)( void * ),
                       void *data, int prio /* -3..+3 */ );
-                 
+
 # define THREAD_PRIO_MIN (-3)
 # define THREAD_PRIO_MAX (+3)
 
@@ -174,10 +167,10 @@ bool_t SIGNAL_WAIT( SIGNAL_T *ref, MUTEX_T *mu, time_d timeout );
   typedef pthread_t THREAD_T;
 # define THREAD_ISNULL( _h) 0 // pthread_t may be a structure: never 'null' by itself
 
-  void THREAD_CREATE( THREAD_T *ref, 
+  void THREAD_CREATE( THREAD_T *ref,
                       THREAD_RETURN_T (*func)( void * ),
                       void *data, int prio /* -2..+2 */ );
-                      
+
 # if defined(PLATFORM_LINUX)
   volatile bool_t sudo;
 #  ifdef LINUX_SCHED_RR
@@ -192,7 +185,7 @@ bool_t SIGNAL_WAIT( SIGNAL_T *ref, MUTEX_T *mu, time_d timeout );
 # endif
 #endif // THREADAPI == THREADAPI_WINDOWS
 
-/* 
+/*
 * Win32 and PTHREAD_TIMEDJOIN allow waiting for a thread with a timeout.
 * Posix without PTHREAD_TIMEDJOIN needs to use a condition variable approach.
 */
diff --git a/tests/fibonacci.lua b/tests/fibonacci.lua
index 55dede1..452a770 100644
--- a/tests/fibonacci.lua
+++ b/tests/fibonacci.lua
@@ -89,5 +89,5 @@ assert( #right==99 )
 local N= 80
 local res= fib(N)
 print( right[N], res )
-assert( res==right[N] )
+-- assert( res==right[N] ) -- can't guarantee such a large number will match exactly