Improve Calysto support

bk: 46ba60edzKUxjh0MgsVX_zGWx94Eyg

diff --git a/ChangeLog b/ChangeLog
index 8ea2b9f708258b9d2bfbe3db2a4b5da756176f1d..00a560dc3385c918dd54a2e36ce1e00fd556d5c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Improve Calysto support.
 * The "revoke" parameter is a crypto command.
 * The driftfile wander threshold is a real number.
 * [Bug 850] Fix the wander threshold parameter on the driftfile command.

diff --git a/include/ntp_assert.h b/include/ntp_assert.h
index 7340548f1491ce4318f55b04911d67d271570a15..dd0b453f443b074d3d1216e25b5da0df17c4ed9b 100644 (file)
--- a/include/ntp_assert.h
+++ b/include/ntp_assert.h
@@ -5,6 +5,17 @@
 #ifndef NTP_ASSSERT_H
 #define NTP_ASSERT_H
 
+# ifdef CALYSTO 
+
+extern void calysto_assume(unsigned char cnd); /* assume this always holds */ 
+extern void calysto_assert(unsigned char cnd); /* check whether this holds */ 
+#define NTP_REQUIRE(x)  calysto_assert(x) 
+#define NTP_INSIST(x)   calysto_assume(x) 
+#define NTP_INVARIANT(x) calysto_assume(x) 
+#define NTP_ENSURE(x)   calysto_assert(x) 
+ 
+# else /* ~CALYSTO */
+
 #include "isc/assertions.h"
 
 #define NTP_REQUIRE(x) ISC_REQUIRE(x)
@@ -12,4 +23,5 @@
 #define NTP_INVARIANT(x) ISC_INVARIANT(x)
 #define NTP_ENSURE(x)  ISC_ENSURE(x)
 
+# endif /* ~CALYSTO */
 #endif