From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 9 Aug 2007 00:33:49 +0000 (-0400)
Subject: Improve Calysto support
X-Git-Tag: NTP_4_2_5P67~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cf3d4d5746c976f40342dc00c91626fe44fe5e9;p=thirdparty%2Fntp.git

Improve Calysto support

bk: 46ba60edzKUxjh0MgsVX_zGWx94Eyg
---

diff --git a/ChangeLog b/ChangeLog
index 8ea2b9f70..00a560dc3 100644
--- 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 7340548f1..dd0b453f4 100644
--- 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