Remove erroneous GC_use_threads_discovery call from GC_DllMain

* win32_threads.c (GC_use_threads_discovery): Uncomment assertion;
update comment.
* win32_threads.c (GC_DllMain): Remove erroneous
GC_use_threads_discovery call; add comment.
* windows-untested/vc9/libgc.vcproj (PreprocessorDefinitions): Add
GC_DISCOVER_TASK_THREADS (due to removal of GC_use_threads_discovery
from GC_DllMain).

Conflicts:

    win32_threads.c

diff --git a/win32_threads.c b/win32_threads.c
index 31d33b65c391882d4e347af7c9a5152bcadca5f9..a264e001ef37e9af48d4e1cf1413db4fe342522b 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -158,6 +158,8 @@ GC_API void GC_CALL GC_use_threads_discovery(void)
 # else
     /* Turn on GC_win32_dll_threads. */
     GC_ASSERT(!parallel_initialized);
+    /* Note that GC_use_threads_discovery is expected to be called by   */
+    /* the client application (not from DllMain) at start-up.           */
 #   ifndef GC_DISCOVER_TASK_THREADS
       GC_win32_dll_threads = TRUE;
 #   endif
@@ -2674,6 +2676,11 @@ GC_INNER void GC_thr_init(void)
       DWORD thread_id;
       static int entry_count = 0;
 
+      /* Note that GC_use_threads_discovery should be called by the     */
+      /* client application at start-up to activate automatic thread    */
+      /* registration (it is the default GC behavior since v7.0alpha7); */
+      /* to always have automatic thread registration turned on, the GC */
+      /* should be compiled with -D GC_DISCOVER_TASK_THREADS.           */
       if (!GC_win32_dll_threads && parallel_initialized) return TRUE;
 
       switch (reason) {

diff --git a/windows-untested/vc9/libgc.vcproj b/windows-untested/vc9/libgc.vcproj
index 195febfe293f2bab190b12a8921a12b1fb2b3d27..9e91f7b015536a06b4bd5515188b99306e00e29e 100644 (file)
--- a/windows-untested/vc9/libgc.vcproj
+++ b/windows-untested/vc9/libgc.vcproj
@@ -43,7 +43,7 @@
             <Tool
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories="../../libatomic_ops/src/"
-                PreprocessorDefinitions="GC_BUILD"
+                PreprocessorDefinitions="GC_BUILD;GC_DISCOVER_TASK_THREADS"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -106,7 +106,7 @@
             <Tool
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories="../../libatomic_ops/src/"
-                PreprocessorDefinitions="GC_BUILD"
+                PreprocessorDefinitions="GC_BUILD;GC_DISCOVER_TASK_THREADS"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -169,7 +169,7 @@
             <Tool
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories="../../libatomic_ops/src/"
-                PreprocessorDefinitions="GC_BUILD"
+                PreprocessorDefinitions="GC_BUILD;GC_DISCOVER_TASK_THREADS"
                 UsePrecompiledHeader="0"
             />
             <Tool
@@ -233,7 +233,7 @@
             <Tool
                 Name="VCCLCompilerTool"
                 AdditionalIncludeDirectories="../../libatomic_ops/src/"
-                PreprocessorDefinitions="GC_BUILD"
+                PreprocessorDefinitions="GC_BUILD;GC_DISCOVER_TASK_THREADS"
                 UsePrecompiledHeader="0"
             />
             <Tool