Loading...
include/assert.h Libc-391.4.2 Libc-763.12
--- Libc/Libc-391.4.2/include/assert.h
+++ Libc/Libc-763.12/include/assert.h
@@ -68,24 +68,32 @@
 #define assert(e)  \
     ((void) ((e) ? 0 : __assert (#e, __FILE__, __LINE__)))
 #define __assert(e, file, line) \
-    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort(), 0)
+    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort())
 
 #else /* __GNUC__ */
 
 __BEGIN_DECLS
 void __assert_rtn(const char *, const char *, int, const char *) __dead2;
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1070)
 void __eprintf(const char *, const char *, unsigned, const char *) __dead2;
+#endif
 __END_DECLS
 
+#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && ((__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0) < 1070)
 #define __assert(e, file, line) \
-    (__eprintf ("%s:%u: failed assertion `%s'\n", file, line, e), 0)
+    __eprintf ("%s:%u: failed assertion `%s'\n", file, line, e)
+#else
+/* 8462256: modified __assert_rtn() replaces deprecated __eprintf() */
+#define __assert(e, file, line) \
+    __assert_rtn ((const char *)-1L, file, line, e)
+#endif
 
 #if __DARWIN_UNIX03
 #define	assert(e) \
     (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __FILE__, __LINE__, #e) : (void)0)
 #else /* !__DARWIN_UNIX03 */
 #define assert(e)  \
-    ((void) (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : 0))
+    (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : (void)0)
 #endif /* __DARWIN_UNIX03 */
 
 #endif /* __GNUC__ */