From 3968f7725a2eab6e579055ee44420f44c4a0be73 Mon Sep 17 00:00:00 2001
From: Marcelo Roberto Jimenez <marcelo.jimenez@gmail.com>
Date: Sun, 1 Aug 2021 20:44:13 -0300
Subject: [PATCH] ithread: Remove references to
 pthread_mutexattr_{g,s}etkind_np

---
 upnp/inc/ithread.h | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/upnp/inc/ithread.h b/upnp/inc/ithread.h
index f6800ea9..2087466b 100644
--- a/upnp/inc/ithread.h
+++ b/upnp/inc/ithread.h
@@ -304,11 +304,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
  *      Returns EINVAL if the kind is not supported.
  *      See man page for pthread_mutexattr_setkind_np
  *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
-#else
-	#define ithread_mutexattr_setkind_np pthread_mutexattr_setkind_np
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_mutexattr_setkind_np pthread_mutexattr_settype
+#define ithread_mutexattr_settype pthread_mutexattr_settype
 
 /****************************************************************************
  * Function: ithread_mutexattr_getkind_np
@@ -329,11 +326,8 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
  *      Always returns 0.
  *      See man page for pthread_mutexattr_getkind_np
  *****************************************************************************/
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
-#else
-	#define ithread_mutexattr_getkind_np pthread_mutexattr_getkind_np
-#endif /* UPNP_USE_RWLOCK */
+#define ithread_mutexattr_getkind_np pthread_mutexattr_gettype
+#define ithread_mutexattr_gettype pthread_mutexattr_gettype
 
 /****************************************************************************
  * Function: ithread_mutex_init
@@ -898,15 +892,16 @@ static UPNP_INLINE int ithread_cleanup_thread(void)
 #ifdef _WIN32
 	#define imillisleep Sleep
 #else
-#if _POSIX_C_SOURCE < 200809L
-	#define imillisleep(x) usleep(1000 * x)
-#else
-	#define imillisleep(x) \
-		do { \
-			const struct timespec req = {0, x * 1000 * 1000}; \
-			nanosleep(&req, NULL); \
-		} while(0)
-#endif
+	#if _POSIX_C_SOURCE < 200809L
+		#define imillisleep(x) usleep(1000 * x)
+	#else
+		#define imillisleep(x) \
+			do { \
+				const struct timespec req = { \
+					0, x * 1000 * 1000}; \
+				nanosleep(&req, NULL); \
+			} while (0)
+	#endif
 #endif
 
 #if !defined(PTHREAD_MUTEX_RECURSIVE) && !defined(__DragonFly__) && \