2011-05-31 Ivan Maidanski <ivmai@mail.ru>

	* win32_threads.c (GC_unregister_my_thread): Use KNOWN_FINISHED()
	instead of FINISHED macro.
	* tests/test.c (check_heap_stats): Round up max_heap_sz value for
	Win32 (same as for USE_MMAP).

diff --git a/ChangeLog b/ChangeLog
index 4eb5685c84a4b8d30a6cd2a86aaf2b62cee648de..b31e5ed3d9f7dbad50e4498fb6ef35c348ebd64b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-31  Ivan Maidanski  <ivmai@mail.ru>
+
+       * win32_threads.c (GC_unregister_my_thread): Use KNOWN_FINISHED()
+       instead of FINISHED macro.
+       * tests/test.c (check_heap_stats): Round up max_heap_sz value for
+       Win32 (same as for USE_MMAP).
+
 2011-05-31  Ivan Maidanski  <ivmai@mail.ru>
 
        * tests/test.c (check_heap_stats): Adjust printf format specifier

diff --git a/tests/test.c b/tests/test.c
index 153d9775b64b632ec965b2cd03cfb4b08bc04291..c486714a9ea9292467f3ba7280428e2b95d141d9 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -1275,7 +1275,7 @@ void check_heap_stats(void)
 #       endif
 #   endif
     max_heap_sz *= n_tests;
-#   ifdef USE_MMAP
+#   if defined(USE_MMAP) || defined(MSWIN32)
       max_heap_sz = NUMBER_ROUND_UP(max_heap_sz, 4 * 1024 * 1024);
 #   endif
     /* Garbage collect repeatedly so that all inaccessible objects      */

diff --git a/win32_threads.c b/win32_threads.c
index 68752faed467677978970d07b854cfa039ebbc5e..15b4b15cbf22bca2ce41bc20e4bb7934496de3db 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -776,7 +776,7 @@ GC_API int GC_CALL GC_unregister_my_thread(void)
     LOCK();
 #   if defined(THREAD_LOCAL_ALLOC) || defined(GC_PTHREADS)
       me = GC_lookup_thread_inner(thread_id);
-      GC_ASSERT(!(me -> flags & FINISHED));
+      GC_ASSERT(!KNOWN_FINISHED(me));
 #   endif
 #   if defined(THREAD_LOCAL_ALLOC)
       GC_destroy_thread_local(&(me->tlfs));