1 files changed, 7 insertions, 33 deletions

diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index ea1d9d43f0..f047104103 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -72,7 +72,7 @@ static void thr_exit_cleanup(void)
 
 /* Argument passed to thr_wrapper() */
 typedef struct {
-    ethr_atomic_t result;
+    ethr_atomic32_t result;
     ethr_ts_event *tse;
     void *(*thr_func)(void *);
     void *arg;
@@ -81,14 +81,14 @@ typedef struct {
 
 static void *thr_wrapper(void *vtwd)
 {
-    long result;
+    ethr_sint32_t result;
     void *res;
     ethr_thr_wrap_data__ *twd = (ethr_thr_wrap_data__ *) vtwd;
     void *(*thr_func)(void *) = twd->thr_func;
     void *arg = twd->arg;
     ethr_ts_event *tsep = NULL;
 
-    result = (long) ethr_make_ts_event__(&tsep);
+    result = (ethr_sint32_t) ethr_make_ts_event__(&tsep);
 
     if (result == 0) {
 	tsep->iflgs |= ETHR_TS_EV_ETHREAD;
@@ -99,7 +99,7 @@ static void *thr_wrapper(void *vtwd)
     tsep = twd->tse; /* We aren't allowed to follow twd after
 			result has been set! */
 
-    ethr_atomic_set(&twd->result, result);
+    ethr_atomic32_set(&twd->result, result);
 
     ethr_event_set(&tsep->event);
 
@@ -191,7 +191,7 @@ ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
     }
 #endif
 
-    ethr_atomic_init(&twd.result, -1);
+    ethr_atomic32_init(&twd.result, (ethr_sint32_t) -1);
     twd.tse = ethr_get_ts_event();
     twd.thr_func = func;
     twd.arg = arg;
@@ -252,10 +252,10 @@ ethr_thr_create(ethr_tid *tid, void * (*func)(void *), void *arg,
 
 	/* Wait for child to initialize... */
 	while (1) {
-	    long result;
+	    ethr_sint32_t result;
 	    ethr_event_reset(&twd.tse->event);
 
-	    result = ethr_atomic_read(&twd.result);
+	    result = ethr_atomic32_read(&twd.result);
 	    if (result == 0)
 		break;
 
@@ -349,32 +349,6 @@ ethr_leave_ts_event(ethr_ts_event *tsep)
 }
 
 /*
- * Current time
- */
-
-int
-ethr_time_now(ethr_timeval *time)
-{
-    int res;
-    struct timeval tv;
-#if ETHR_XCHK
-    if (ethr_not_inited__) {
-	ETHR_ASSERT(0);
-	return EACCES;
-    }
-    if (!time) {
-	ETHR_ASSERT(0);
-	return EINVAL;
-    }
-#endif
-
-    res = gettimeofday(&tv, NULL);
-    time->tv_sec = (long) tv.tv_sec;
-    time->tv_nsec = ((long) tv.tv_usec)*1000;
-    return res;
-}
-
-/*
  * Thread specific data
  */