Merge pull request #17 from LuaDist/550dd55b0e571577a4ca6ccc880738f1268adb57

merge commits from steve

1 files changed, 6 insertions, 13 deletions

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.
 */