aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Tobler <andreast@sourceware.org>2012-01-11 21:51:31 +0000
committerAndreas Tobler <andreast@sourceware.org>2012-01-11 21:51:31 +0000
commit2efa2c79ea0c2bcd8cc35dcdfe49492ba5304134 (patch)
tree388e0f71bd80594569d1ba16c6b96b68758639af
parent88e7d25d8daee9ae228af4ead1fd61bb8657c126 (diff)
downloadgdb-2efa2c79ea0c2bcd8cc35dcdfe49492ba5304134.zip
gdb-2efa2c79ea0c2bcd8cc35dcdfe49492ba5304134.tar.gz
gdb-2efa2c79ea0c2bcd8cc35dcdfe49492ba5304134.tar.bz2
2012-01-11 Andreas Tobler <andreast@fgznet.ch>
* common/gdb_assert.h (gdb_static_assert): Rename static_assert to an internal gdb_static_assert. * mi/mi-common.c: Rename static_assert to gdb_static_assert.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/common/gdb_assert.h2
-rw-r--r--gdb/mi/mi-common.c3
3 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b58f885..2bef9ee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-11 Andreas Tobler <andreast@fgznet.ch>
+
+ * common/gdb_assert.h (gdb_static_assert): Rename static_assert to
+ an internal gdb_static_assert.
+ * mi/mi-common.c: Rename static_assert to gdb_static_assert.
+
2012-01-11 Tom Tromey <tromey@redhat.com>
PR gdb/9598:
diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index 351f558..dc79a08 100644
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/gdb_assert.h
@@ -22,7 +22,7 @@
/* A static assertion. This will cause a compile-time error if EXPR,
which must be a compile-time constant, is false. */
-#define static_assert(expr) \
+#define gdb_static_assert(expr) \
extern int never_defined_just_used_for_checking[(expr) ? 1 : -1]
/* PRAGMATICS: "gdb_assert.h":gdb_assert() is a lower case (rather
diff --git a/gdb/mi/mi-common.c b/gdb/mi/mi-common.c
index 1eaa990..1a3851e 100644
--- a/gdb/mi/mi-common.c
+++ b/gdb/mi/mi-common.c
@@ -43,7 +43,8 @@ static const char * const async_reason_string_lookup[] =
NULL
};
-static_assert (ARRAY_SIZE (async_reason_string_lookup) == EXEC_ASYNC_LAST + 1);
+gdb_static_assert (ARRAY_SIZE (async_reason_string_lookup)
+ == EXEC_ASYNC_LAST + 1);
const char *
async_reason_lookup (enum async_reply_reason reason)