diff options
| author | Doug Evans <dje@google.com> | 2014-01-17 10:00:07 -0800 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2014-01-17 10:00:07 -0800 |
| commit | df049a5831c7c573698b98bfd4bc0ec8dc854c1f (patch) | |
| tree | 61be8d087595fb6b54328f8db7e9e0f950cb28f6 /gdb/common/common-utils.h | |
| parent | ea38d2a92e349df1f6438c1bd7b899f4cd951321 (diff) | |
| download | gdb-df049a5831c7c573698b98bfd4bc0ec8dc854c1f.zip gdb-df049a5831c7c573698b98bfd4bc0ec8dc854c1f.tar.gz gdb-df049a5831c7c573698b98bfd4bc0ec8dc854c1f.tar.bz2 | |
Move ASSERT_FUNCTION to FUNCTION_NAME.
* common/common-utils.h (FUNCTION_NAME): Renamed from ASSERT_FUNCTION,
and moved here ...
* common/gdb_assert.h (ASSERT_FUNCTION): ... from here.
#include "common-utils.h".
(gdb_assert, gdb_assert_fail, gdb_assert_not_reached): Update.
* common/vec.h (VEC_ASSERT_PASS): Update.
* darwin-nat.h: Replace #include of gdb_assert.h with common-utils.h.
(MACH_CHECK_ERROR): Update.
Diffstat (limited to 'gdb/common/common-utils.h')
| -rw-r--r-- | gdb/common/common-utils.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h index 9777ac0..2d99549 100644 --- a/gdb/common/common-utils.h +++ b/gdb/common/common-utils.h @@ -25,6 +25,19 @@ #include <stddef.h> #include <stdarg.h> +/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' + which contains the name of the function currently being defined. + 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. */ +#if (GCC_VERSION >= 2004) +#define FUNCTION_NAME __PRETTY_FUNCTION__ +#else +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L +#define FUNCTION_NAME __func__ +#endif +#endif + extern void malloc_failure (long size) ATTRIBUTE_NORETURN; extern void internal_error (const char *file, int line, const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (3, 4); |