Index: generic/nsfInt.h
===================================================================
diff -u -rc01b411cdc631fd8e3eea9bf8fea985837a2b4b3 -r433266d82cf2bb865b6294006d815b7608e78465
--- generic/nsfInt.h	(.../nsfInt.h)	(revision c01b411cdc631fd8e3eea9bf8fea985837a2b4b3)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 433266d82cf2bb865b6294006d815b7608e78465)
@@ -102,11 +102,7 @@
 # define nonnull(ARGS)
 #endif
 
-#if __GNUC_PREREQ(6, 0)
-# define nonnull_assert(assertion) 
-#else
-# define nonnull_assert(assertion) assert((assertion))
-#endif
+#define nonnull_assert(assertion) assert((assertion))
 
 
 #if __GNUC_PREREQ(4, 9)