win32: fix function name clash
authorRyan Lortie <desrt@desrt.ca>
Thu, 13 Oct 2011 02:49:39 +0000 (22:49 -0400)
committerRyan Lortie <desrt@desrt.ca>
Thu, 13 Oct 2011 02:49:39 +0000 (22:49 -0400)
glib/gthread-win32.c

index 2babc92..c8af9c8 100644 (file)
@@ -476,7 +476,7 @@ g_system_thread_exit (void)
 }
 
 static guint __stdcall
-g_thread_proxy (gpointer data)
+g_thread_win32_proxy (gpointer data)
 {
   GThreadData *self = (GThreadData*) data;
 
@@ -508,7 +508,7 @@ g_system_thread_new (GThreadFunc   func,
 
   retval->joinable = joinable;
 
-  retval->thread = (HANDLE) _beginthreadex (NULL, stack_size, g_thread_proxy,
+  retval->thread = (HANDLE) _beginthreadex (NULL, stack_size, g_thread_win32_proxy,
                                            retval, 0, &ignore);
 
   if (retval->thread == NULL)