From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 4 May 2018 20:02:05 +0000 (+0300)
Subject: Allow passing -D DEFAULT_VDB to CFLAGS
X-Git-Tag: v8.0.0~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78fb2cc5d0a582e963b29424acd75dc69fbae985;p=gc

Allow passing -D DEFAULT_VDB to CFLAGS

* include/private/gcconfig.h [DEFAULT_VDB] (GWW_VDB, MPROTECT_VDB,
PCR_VDB, PROC_VDB): Undefine.
* include/private/gcconfig.h [!PCR_VDB && !PROC_VDB && !MPROTECT_VDB
&& !GWW_VDB && !MANUAL_VDB && !GC_DISABLE_INCREMENTAL] (DEFAULT_VDB):
Do not define if already defined.
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index e382fbd6..0148b456 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -3073,7 +3073,8 @@ EXTERN_C_BEGIN
 # define MUNMAP_THRESHOLD 2
 #endif
 
-#if defined(GC_DISABLE_INCREMENTAL) || defined(MANUAL_VDB)
+#if defined(GC_DISABLE_INCREMENTAL) || defined(DEFAULT_VDB) \
+    || defined(MANUAL_VDB)
 # undef GWW_VDB
 # undef MPROTECT_VDB
 # undef PCR_VDB
@@ -3124,7 +3125,7 @@ EXTERN_C_BEGIN
 #endif
 
 #if !defined(PCR_VDB) && !defined(PROC_VDB) && !defined(MPROTECT_VDB) \
-    && !defined(GWW_VDB) && !defined(MANUAL_VDB) \
+    && !defined(GWW_VDB) && !defined(DEFAULT_VDB) && !defined(MANUAL_VDB) \
     && !defined(GC_DISABLE_INCREMENTAL)
 # define DEFAULT_VDB
 #endif