Index: src/libcfa/libhdr/libdebug.h
===================================================================
--- src/libcfa/libhdr/libdebug.h	(revision e464759b49c8d2ebccb89821c40321561033cefd)
+++ src/libcfa/libhdr/libdebug.h	(revision 4aa2fb2fad2ee92eaf9a9a953a06997b44a330f0)
@@ -18,10 +18,19 @@
 
 #ifdef __CFA_DEBUG__
-      #define LIB_DEBUG_DO(x) x
-      #define LIB_NO_DEBUG_DO(x) ((void)0)
+	#define LIB_DEBUG_DO(x) x
+	#define LIB_NO_DEBUG_DO(x) ((void)0)
 #else
-      #define LIB_DEBUG_DO(x) ((void)0)
-      #define LIB_NO_DEBUG_DO(x) x      
+	#define LIB_DEBUG_DO(x) ((void)0)
+	#define LIB_NO_DEBUG_DO(x) x      
 #endif
+
+#if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__))
+	#define verify(x) assert(x)
+	#define verifyf(x, ...) assertf(x, __VA_ARGS__)
+#else
+	#define verify(x)
+	#define verifyf(x, ...)
+#endif
+
 
 #ifdef __cforall