--- Gnu-Mach/kern/assert.h	2020/09/02 04:36:56	1.1.1.1
+++ Gnu-Mach/kern/assert.h	2020/09/02 04:47:25	1.1.1.4
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -31,28 +31,23 @@
 
 #include <kern/macro_help.h>
 
-#ifdef DEBUG
+#ifndef NDEBUG
 #define MACH_ASSERT 1
 #endif
 
 #if	MACH_ASSERT
-extern void Assert(char *exp, char *filename, int line);
+extern void Assert(const char *exp, const char *filename, int line) __attribute__ ((noreturn));
 
 #define assert(ex)							\
-MACRO_BEGIN								\
-	if (!(ex))							\
-		Assert(#ex, __FILE__, __LINE__);			\
-MACRO_END
-
-#ifdef	lint
-#define	assert_static(x)
-#else	lint
+	((ex)								\
+	 ? (void) (0)							\
+	 : Assert (#ex, __FILE__, __LINE__))
+
 #define	assert_static(x)	assert(x)
-#endif	lint
 
-#else	MACH_ASSERT
+#else	/* MACH_ASSERT */
 #define assert(ex)
 #define assert_static(ex)
-#endif	MACH_ASSERT
+#endif	/* MACH_ASSERT */
 
-#endif	_KERN_ASSERT_H_
+#endif	/* _KERN_ASSERT_H_ */