diff options
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert-perr.c | 1 | ||||
| -rw-r--r-- | assert/assert.c | 1 | ||||
| -rw-r--r-- | assert/assert.h | 8 |
3 files changed, 3 insertions, 7 deletions
diff --git a/assert/assert-perr.c b/assert/assert-perr.c index ecfb5ee888..384735d576 100644 --- a/assert/assert-perr.c +++ b/assert/assert-perr.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <string.h> #include <sysdep.h> +#include <libintl.h> extern const char *__assert_program_name; /* In assert.c. */ diff --git a/assert/assert.c b/assert/assert.c index f1144101f8..e957a44f97 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdlib.h> #include <sysdep.h> +#include <libintl.h> const char *__assert_program_name; diff --git a/assert/assert.h b/assert/assert.h index bbff9417f4..386e80c3b1 100644 --- a/assert/assert.h +++ b/assert/assert.h @@ -87,17 +87,11 @@ __END_DECLS /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' which contains the name of the function currently being defined. -# define __ASSERT_FUNCTION __PRETTY_FUNCTION__ This is broken in G++ before version 2.6. C9x has a similar variable called __func__, but prefer the GCC one since it demangles C++ function names. */ -# ifdef __GNUC__ -# if __GNUC__ > 2 || (__GNUC__ == 2 \ - && __GNUC_MINOR__ >= (defined __cplusplus ? 6 : 4)) +# if __GNUC_PREREQ (2, (defined __cplusplus ? 6 : 4)) # define __ASSERT_FUNCTION __PRETTY_FUNCTION__ -# else -# define __ASSERT_FUNCTION ((__const char *) 0) -# endif # else # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L # define __ASSERT_FUNCTION __func__ |