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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b58f885c3bdd59bb71261c864a40552e7c071868..2bef9ee42b844a99c58bd852142c9cdeccbabe42 100644 (file)
--- 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 351f55877e344a32b5d1f0705cc5aeb24a8cb550..dc79a0823da1451ae1d8bab2db1cd7b7806e83e8 100644 (file)
--- 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 1eaa99011bd9a2953f6e431d9f75c74a2cdf8ae9..1a3851e72986363a189d71803b93b09f4cd8a5bd 100644 (file)
--- 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)