Index: trunk/include/samhain.h
===================================================================
--- trunk/include/samhain.h	(revision 22)
+++ trunk/include/samhain.h	(revision 25)
@@ -301,9 +301,13 @@
 int safe_fatal  (int signal, int method, char * details, char *f, int l);
 
-#define SH_VAL_EQ(a,b) \
+#define SH_VALIDATE_EQ(a,b) \
      do { \
          if ((a) != (b)) safe_fatal(0, 0, #a " != " #b, FIL__, __LINE__);\
      } while (0)
 
+#define SH_VALIDATE_NE(a,b) \
+     do { \
+         if ((a) == (b)) safe_fatal(0, 0, #a " == " #b, FIL__, __LINE__);\
+     } while (0)
 
 #if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
Index: trunk/include/sh_unix.h
===================================================================
--- trunk/include/sh_unix.h	(revision 22)
+++ trunk/include/sh_unix.h	(revision 25)
@@ -141,4 +141,7 @@
 int sh_unix_munlock(void * addr, size_t len);
 int sh_unix_count_mlock();
+/* public for unit tests */
+int sh_unix_pagesize();
+unsigned long sh_unix_lookup_page(void * in_addr, size_t len, int * num_pages);
 
 /* chroot directory