fix git conflict

[c11tester.git] / config.h

diff --git a/config.h b/config.h
index 971ea27d2705ceabc3d43c8c06e6a0a60dd01077..43c044278eac3350d507309f86a9b05582308ca8 100644 (file)
--- a/config.h
+++ b/config.h
@@ -7,9 +7,13 @@
 
 /** Turn on debugging. */
 /*             #ifndef CONFIG_DEBUG
-               #define CONFIG_DEBUG
-               #endif
-*/
+ #define CONFIG_DEBUG
+ #endif
+
+ #ifndef CONFIG_ASSERT
+ #define CONFIG_ASSERT
+ #endif
+ */
 
 /** Turn on support for dumping cyclegraphs as dot files at each
  *  printed summary.*/
@@ -23,15 +27,15 @@
 #else
 #define BIT48 0
 #endif
-#endif /* BIT48 */
+#endif /* BIT48 */
 
 /** Snapshotting configurables */
 
-/** 
+/**
  * If USE_MPROTECT_SNAPSHOT=2, then snapshot by tuned mmap() algorithm
  * If USE_MPROTECT_SNAPSHOT=1, then snapshot by using mmap() and mprotect()
  * If USE_MPROTECT_SNAPSHOT=0, then snapshot by using fork() */
-#define USE_MPROTECT_SNAPSHOT 2
+#define USE_MPROTECT_SNAPSHOT 0
 
 /** Size of signal stack */
 #define SIGSTACKSIZE 65536
@@ -44,5 +48,10 @@
 /* Size of stack to allocate for a thread. */
 #define STACK_SIZE (1024 * 1024)
 
+/** How many shadow tables of memory to preallocate for data race detector. */
+#define SHADOWBASETABLES 4
+
+/** Enable debugging assertions (via ASSERT()) */
+#define CONFIG_ASSERT
 
 #endif