aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-05-15 00:34:48 -0400
committerUlrich Drepper <drepper@gmail.com>2011-05-15 00:34:48 -0400
commitf8a3b5bf8fa1d0c43d2458e03cc109a04fdef194 (patch)
treec92e262e52b730a8bd4bc3505f46ded142b7cebd /include
parentfc317541ab359b33ed7bf402ead84ba6f112604c (diff)
downloadglibc-f8a3b5bf8fa1d0c43d2458e03cc109a04fdef194.tar
glibc-f8a3b5bf8fa1d0c43d2458e03cc109a04fdef194.tar.gz
glibc-f8a3b5bf8fa1d0c43d2458e03cc109a04fdef194.tar.bz2
glibc-f8a3b5bf8fa1d0c43d2458e03cc109a04fdef194.zip
Use mmap for allocation of buffers used for __abort_msg
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 */