2004-09-08 Bernie Solomon <bernard@ugsolutions.com>

	* threads.c appdomain.c: fix typo in GC macro

svn path=/trunk/mono/; revision=33583

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 32cd651756ba1ac2894ca82de97c3e524bf0757e..24b47aabe3227a305d19ec84c8b79f7bc200606a 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,6 @@
+2004-09-08 Bernie Solomon <bernard@ugsolutions.com>
+       * threads.c appdomain.c: fix typo in GC macro
+
 2004-09-08 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * threads.c: don't call mono_thread_detach() in start_wrapper(),

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 90dbf53ffb00f513de731bcc79760c13051ae28e..db04be9fa1b834139eb79a5f15a586a7ac493628 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -1284,7 +1284,7 @@ mono_domain_unload (MonoDomain *domain)
 #if 0
        thread_handle = CreateThread (NULL, 0, unload_thread_main, &thread_data, 0, &tid);
 #else
-#if defined(PLATFORM_WIN32) && defined (HAVE_GC_BOEHM)
+#if defined(PLATFORM_WIN32) && defined (HAVE_BOEHM_GC)
        thread_handle = GC_CreateThread (NULL, 0, unload_thread_main, &thread_data, CREATE_SUSPENDED, &tid);
 #else
        thread_handle = CreateThread (NULL, 0, unload_thread_main, &thread_data, CREATE_SUSPENDED, &tid);

diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index 7e1286736a67cc54f89b3caef477ff07ac659ae3..521611f0299a86111779dce029e06d22af0554dd 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -330,7 +330,7 @@ void mono_thread_create (MonoDomain *domain, gpointer func, gpointer arg)
        /* Create suspended, so we can do some housekeeping before the thread
         * starts
         */
-#if defined(PLATFORM_WIN32) && defined(HAVE_GC_BOEHM)
+#if defined(PLATFORM_WIN32) && defined(HAVE_BOEHM_GC)
        thread_handle = GC_CreateThread(NULL, default_stacksize, start_wrapper, start_info,
                                     CREATE_SUSPENDED, &tid);
 #else
@@ -457,8 +457,13 @@ HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoThread *this,
                        return(NULL);
                }
 
+#if defined(PLATFORM_WIN32) && defined(HAVE_BOEHM_GC)
+               thread=GC_CreateThread(NULL, default_stacksize, start_wrapper, start_info,
+                                   CREATE_SUSPENDED, &tid);
+#else
                thread=CreateThread(NULL, default_stacksize, start_wrapper, start_info,
                                    CREATE_SUSPENDED, &tid);
+#endif
                if(thread==NULL) {
                        g_warning(G_GNUC_PRETTY_FUNCTION
                                  ": CreateThread error 0x%x", GetLastError());