about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/assert.h8
-rw-r--r--include/stdlib.h11
2 files changed, 15 insertions, 4 deletions
diff --git a/include/assert.h b/include/assert.h
index b53313de8f..4b022342ef 100644
--- a/include/assert.h
+++ b/include/assert.h
@@ -5,7 +5,7 @@
    so it has to be repeated here.  */
 extern void __assert_fail (__const char *__assertion, __const char *__file,
 			   unsigned int __line, __const char *__function)
-  __THROW __attribute__ ((__noreturn__));
+     __THROW __attribute__ ((__noreturn__));
 
 /* Likewise, but prints the error text for ERRNUM.  */
 extern void __assert_perror_fail (int __errnum, __const char *__file,
@@ -13,6 +13,12 @@ extern void __assert_perror_fail (int __errnum, __const char *__file,
 				  __const char *__function)
      __THROW __attribute__ ((__noreturn__));
 
+/* The real implementation of the two functions above.  */
+extern void __assert_fail_base (const char *fmt, const char *assertion,
+				const char *file, unsigned int line,
+				const char *function)
+     __THROW  __attribute__ ((__noreturn__));
+
 #if !defined NOT_IN_libc || defined IS_IN_rtld
 hidden_proto (__assert_fail)
 hidden_proto (__assert_perror_fail)
diff --git a/include/stdlib.h b/include/stdlib.h
index b4799d7d04..816f8ffc2e 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -223,16 +223,21 @@ extern int __qfcvt_r (long double __value, int __ndigit,
 # define __cxa_atexit(func, arg, d) INTUSE(__cxa_atexit) (func, arg, d)
 # endif
 
-#endif
-
 extern void *__default_morecore (ptrdiff_t) __THROW;
 libc_hidden_proto (__default_morecore)
 
-extern char *__abort_msg;
+struct abort_msg_s
+{
+  unsigned int size;
+  char msg[0];
+};
+extern struct abort_msg_s *__abort_msg;
 libc_hidden_proto (__abort_msg)
 
 __END_DECLS
 
+#endif
+
 #undef __Need_M_And_C
 
 #endif  /* include/stdlib.h */