From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 5 Dec 2016 23:06:36 +0000 (+0300)
Subject: Fix message of VDB implementation used if MPROTECT_VDB+GWW_VDB (gctest)
X-Git-Tag: v7.6.2~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f448741d874218fd49c0d9d78877fac8531a14c;p=gc

Fix message of VDB implementation used if MPROTECT_VDB+GWW_VDB (gctest)

* tests/test.c [!PCR && !GC_WIN32_THREADS && !GC_PTHREADS
&& !NO_INCREMENTAL] (main): If MPROTECT_VDB and GWW_VDB are both
defined then also print "Using GetWriteWatch-based implementation"
message.
---

diff --git a/tests/test.c b/tests/test.c
index 8e4c4b5f..0c32fa7a 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -1732,12 +1732,15 @@ void GC_CALLBACK warn_proc(char *msg, GC_word p)
           && !defined(MAKE_BACK_GRAPH) && !defined(NO_INCREMENTAL)
       GC_enable_incremental();
       GC_printf("Switched to incremental mode\n");
-#     if defined(MPROTECT_VDB)
-        GC_printf("Emulating dirty bits with mprotect/signals\n");
-#     elif defined(PROC_VDB)
+#     ifdef PROC_VDB
         GC_printf("Reading dirty bits from /proc\n");
-#     else /* GWW_VDB */
+#     elif defined(GWW_VDB)
         GC_printf("Using GetWriteWatch-based implementation\n");
+#       ifdef MPROTECT_VDB
+          GC_printf("Or emulating dirty bits with mprotect/signals\n");
+#       endif
+#     else /* MPROTECT_VDB && !GWW_VDB */
+        GC_printf("Emulating dirty bits with mprotect/signals\n");
 #     endif
 #   endif
     run_one_test();