hook gvariant vectors up to kdbus

[platform/upstream/glib.git] / gthread / gthread-impl.c

diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index 19608c2..22080da 100644 (file)
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -15,9 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -33,33 +31,18 @@
 
 #include "config.h"
 
-#include "glib.h"
-#include "gthreadprivate.h"
-
-#include G_THREAD_SOURCE
+#include <glib.h>
 
 void
-g_thread_init (GThreadFunctions *init)
+g_thread_init (gpointer init)
 {
-  static gboolean already_done;
-
   if (init != NULL)
     g_warning ("GThread system no longer supports custom thread implementations.");
-
-  if (already_done)
-    return;
-
-  already_done = TRUE;
-
-  g_thread_impl_init ();
-  g_thread_functions_for_glib_use = g_thread_functions_for_glib_use_default;
-  g_thread_init_glib ();
 }
 
 void
-g_thread_init_with_errorcheck_mutexes (GThreadFunctions *vtable)
+g_thread_init_with_errorcheck_mutexes (gpointer vtable)
 {
   g_assert (vtable == NULL);
-
-  g_thread_init (NULL);
+  g_warning ("GThread system no longer supports errorcheck mutexes.");
 }