Remove umtx_t definition, use type long directly, add wrapper function

_thr_umtx_wait_uint() for umtx operation UMTX_OP_WAIT_UINT, use the
function in semaphore operations, this fixed compiler warnings.

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/libthr/thread/thr_umtx.h b/lib/libthr/thread/thr_umtx.h
index 1a60c1a..65d00f2 100644
--- a/lib/libthr/thread/thr_umtx.h
+++ b/lib/libthr/thread/thr_umtx.h
@@ -32,9 +32,7 @@
 #include <strings.h>
 #include <sys/umtx.h>
 
-#define DEFAULT_UMUTEX	{0}
-
-typedef long umtx_t;
+#define DEFAULT_UMUTEX	{0,0, {0,0},{0,0,0,0}}
 
 int __thr_umutex_lock(struct umutex *mtx) __hidden;
 int __thr_umutex_timedlock(struct umutex *mtx,
@@ -45,9 +43,11 @@ int __thr_umutex_set_ceiling(struct umutex *mtx, uint32_t ceiling,
 	uint32_t *oldceiling) __hidden;
 
 void _thr_umutex_init(struct umutex *mtx) __hidden;
-int _thr_umtx_wait(volatile umtx_t *mtx, umtx_t exp,
+int _thr_umtx_wait(volatile long *mtx, long exp,
+	const struct timespec *timeout) __hidden;
+int _thr_umtx_wait_uint(volatile u_int *mtx, u_int exp,
 	const struct timespec *timeout) __hidden;
-int _thr_umtx_wake(volatile umtx_t *mtx, int count) __hidden;
+int _thr_umtx_wake(volatile void *mtx, int count) __hidden;
 int _thr_ucond_wait(struct ucond *cv, struct umutex *m,
         const struct timespec *timeout, int check_unpaking) __hidden;
 void _thr_ucond_init(struct ucond *cv) __hidden;