Index: generic/nsfInt.h
===================================================================
diff -u -r19c84744084963110f84f4ce28fbf55714c79635 -r16a02881bff0a0d626d0045dfd96660338d0c314
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 19c84744084963110f84f4ce28fbf55714c79635)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 16a02881bff0a0d626d0045dfd96660338d0c314)
@@ -104,12 +104,20 @@
 # define nonnull(ARGS)
 #endif
 
+#if __GNUC_PREREQ(6, 0)
+# define nonnull_assert(assertion) 
+#else
+# define nonnull_assert(assertion) assert((assertion))
+#endif
+
+
 #if __GNUC_PREREQ(4, 9)
 # define returns_nonnull __attribute__((returns_nonnull))
 #else
 # define returns_nonnull
 #endif
 
+
 /*
  * Tries to use gcc __attribute__ unused and mangles the name, so the
  * attribute could not be used, if declared as unused.