From: Ryan Lortie <desrt@desrt.ca>
Date: Thu, 13 Oct 2011 02:49:39 +0000 (-0400)
Subject: win32: fix function name clash
X-Git-Tag: 2.31.0~125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67e28068e14428afe8335a1503ea7d734419326d;p=platform%2Fupstream%2Fglib.git

win32: fix function name clash
---

diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 2babc92..c8af9c8 100644
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -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)