Merge GDB 7.5.1

gdb/common/gdb_assert.h

 /* GDB-friendly replacement for <assert.h>.
    Copyright (C) 2000-2001, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef GDB_ASSERT_H
 #define GDB_ASSERT_H
 
 /* 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
    than upper case) macro since that provides the closest fit to the
    existing lower case macro <assert.h>:assert() that it is
    replacing.  */
 
 #define gdb_assert(expr)                                                      \
   ((void) ((expr) ? 0 :                                                       \
            (gdb_assert_fail (#expr, __FILE__, __LINE__, ASSERT_FUNCTION), 0)))
@@ skipping 28 matching lines @@
 
 #if defined (ASSERT_FUNCTION)
 #define gdb_assert_not_reached(message) \
   internal_error (__FILE__, __LINE__, "%s: %s", ASSERT_FUNCTION, _(message))
 #else
 #define gdb_assert_not_reached(message) \
   internal_error (__FILE__, __LINE__, _(message))
 #endif
 
 #endif /* gdb_assert.h */