Merge branch 'master' of jsoftware.com:jsource

Author: moon-chilled

jsrc/j.h

@@ -1943,12 +1943,12 @@ if(likely(type _i<3)){z=(I)&oneone; z=type _i>1?(I)_zzt:z; _zzt=type _i<1?(I*)z:
 #include "ja.h" 
 #include "jc.h" 
 #include "jtype.h" 
-#include "mt.h"
+#include "jerr.h" 
 #include "m.h"
 #include "jt.h" 
+#include "mt.h"
 #include "jlib.h"
 #include "je.h" 
-#include "jerr.h" 
 #include "va.h" 
 #include "vq.h" 
 #include "vx.h" 

jsrc/mt.h

@@ -4,6 +4,20 @@
 #if PYXES
 #ifndef __APPLE__
 #include <pthread.h>
+#if SY_WIN32
+struct timezone {
+    int tz_minuteswest;
+    int tz_dsttime;
+};
+
+// Tip o'hat to Michaelangel007 on StackOverflow
+// MSVC defines this in winsock2.h!?
+typedef struct timeval {
+    long tv_sec;
+    long tv_usec;
+} timeval;
+extern int gettimeofday(struct timeval * tp, struct timezone * tzp);
+#endif
 typedef pthread_mutex_t jtpthread_mutex_t;
 static inline void jtpthread_mutex_init(jtpthread_mutex_t *m,B recursive){
  if(likely(!recursive)){pthread_mutex_init(m,0);}
@@ -18,15 +32,21 @@ static inline C jtpthread_mutex_lock(J jt,jtpthread_mutex_t *m,I self){
  if(r==EDEADLK)R EVCONCURRENCY;
  R EVFACE;}
 static inline I jtpthread_mutex_timedlock(J jt,jtpthread_mutex_t *m,UI ns,I self){
+#if _WIN32
+ struct timeval now;gettimeofday(&now,0);
+ struct timespec t;
+ t.tv_sec=now.tv_sec+ns/1000000000;t.tv_nsec=1000*now.tv_usec+ns%1000000000;if(t.tv_nsec>=1000000000){t.tv_sec++;t.tv_nsec-=1000000000;}
+#else
  struct timespec t;clock_gettime(CLOCK_REALTIME,&t);
  t.tv_sec+=ns/1000000000;t.tv_nsec+=ns%1000000000;if(t.tv_nsec>=1000000000){t.tv_sec++;t.tv_nsec-=1000000000;}
+#endif
  I4 r=pthread_mutex_timedlock(m,&t);
  if(r==0)R 0;
  if(r==ETIMEDOUT)R -1;
  if(r==EDEADLK)R EVCONCURRENCY;
  R EVFACE;}
 static inline I jtpthread_mutex_trylock(jtpthread_mutex_t *m,I self){
- I4 r=pthread_mutex_timedlock(m);
+ I4 r=pthread_mutex_trylock(m);
  if(!r)R 0;
  if(r==ETIMEDOUT)R -1;
  if(r==EDEADLK||r==EOWNERDEAD)R EVCONCURRENCY;