summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorivmai <ivmai>2011-05-23 17:18:04 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:59 +0200
commitd53b6dfbbb335dba60ef960e7e3abee10dcd9ed9 (patch)
tree9c96f158dcb673ad3b72b8731ccab7edbc8709c3 /include
parentdff8113c399acf10ffc677a64cda68ffde2b9253 (diff)
2011-05-23 Ivan Maidanski <ivmai@mail.ru>
* mark.c (GC_dirty): Add prototype (only if MANUAL_VDB). * stubborn.c (GC_dirty): Ditto. * include/private/gcconfig.h (GWW_VDB, MPROTECT_VDB, PCR_VDB, PROC_VDB): Undefine if MANUAL_VDB. * include/private/gcconfig.h (DEFAULT_VDB): Don't define if MANUAL_VDB. * os_dep.c (async_set_pht_entry_from_index): Define for MANUAL_VDB. * os_dep.c (GC_read_dirty): Set GC_dirty_maintained only if success; if ioctl() failed then just print warning instead of aborting.
Diffstat (limited to 'include')
-rw-r--r--include/private/gcconfig.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 5cd3672..bd99e6d 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -2380,11 +2380,14 @@
# define GC_DISABLE_INCREMENTAL
#endif
-#ifdef GC_DISABLE_INCREMENTAL
+#if defined(GC_DISABLE_INCREMENTAL) || defined(MANUAL_VDB)
# undef GWW_VDB
# undef MPROTECT_VDB
# undef PCR_VDB
# undef PROC_VDB
+#endif
+
+#ifdef GC_DISABLE_INCREMENTAL
# undef CHECKSUMS
#endif
@@ -2413,7 +2416,8 @@
#endif
#if !defined(PCR_VDB) && !defined(PROC_VDB) && !defined(MPROTECT_VDB) \
- && !defined(GWW_VDB) && !defined(GC_DISABLE_INCREMENTAL)
+ && !defined(GWW_VDB) && !defined(MANUAL_VDB) \
+ && !defined(GC_DISABLE_INCREMENTAL)
# define DEFAULT_VDB
#endif