From 047efd2cd44732f533cf6652b2421ca415b50ff7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 1 Sep 2020 17:43:22 +0200
Subject: [PATCH] Revert "Resync"

This reverts commit f28056364abbe2a7fe29ea731d02b57725083aae.
---
 libretro-common/include/rthreads/rthreads.h | 12 ++----------
 libretro-common/rthreads/rthreads.c         | 20 ++------------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/libretro-common/include/rthreads/rthreads.h b/libretro-common/include/rthreads/rthreads.h
index 3b1ec7c8c1..e4460a1742 100644
--- a/libretro-common/include/rthreads/rthreads.h
+++ b/libretro-common/include/rthreads/rthreads.h
@@ -90,6 +90,8 @@ int sthread_detach(sthread_t *thread);
  * @thread to terminate. If that thread has already terminated, then
  * it will return immediately. The thread specified by @thread must
  * be joinable.
+ *
+ * Returns: 0 on success, otherwise it returns a non-zero error number.
  */
 void sthread_join(sthread_t *thread);
 
@@ -101,16 +103,6 @@ void sthread_join(sthread_t *thread);
  */
 bool sthread_isself(sthread_t *thread);
 
-/**
- * sthread_set_name:
- * @thread                  : pointer to thread object
- * @name                    : name to define for the thread (at most
- *                            15 bytes)
- *
- * Set the thread name, useful for debugging.
- */
-void sthread_setname(sthread_t *thread, const char *name);
-
 /**
  * slock_new:
  *
diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
index 2edeaad8c4..dd061b6155 100644
--- a/libretro-common/rthreads/rthreads.c
+++ b/libretro-common/rthreads/rthreads.c
@@ -285,6 +285,8 @@ int sthread_detach(sthread_t *thread)
  * @thread to terminate. If that thread has already terminated, then
  * it will return immediately. The thread specified by @thread must
  * be joinable.
+ *
+ * Returns: 0 on success, otherwise it returns a non-zero error number.
  */
 void sthread_join(sthread_t *thread)
 {
@@ -318,24 +320,6 @@ bool sthread_isself(sthread_t *thread)
 #endif
 }
 
-/**
- * sthread_set_name:
- * @thread                  : pointer to thread object
- * @name                    : name to define for the thread (at most
- *                            15 bytes)
- *
- * Set the thread name, useful for debugging.
- */
-void sthread_setname(sthread_t *thread, const char *name)
-{
-   if (!thread)
-      return;
-   /* TODO: implement that for Windows too. */
-#ifndef USE_WIN32_THREADS
-   pthread_setname_np(thread->id, name);
-#endif
-}
-
 /**
  * slock_new:
  *