include/elf/

[deliverable/binutils-gdb.git] / gdb / gdb_assert.h

diff --git a/gdb/gdb_assert.h b/gdb/gdb_assert.h
index 4f0bcdc94978550e983454b34a048e41777cb6e1..7d21beb7bb328adc04ee8ced0c28aa61e6e201e3 100644 (file)
--- a/gdb/gdb_assert.h
+++ b/gdb/gdb_assert.h
@@ -1,11 +1,11 @@
 /* GDB-friendly replacement for <assert.h>.
 /* GDB-friendly replacement for <assert.h>.

-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2007, 2008, 2009 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
 
    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 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef GDB_ASSERT_H
 #define GDB_ASSERT_H
 
 #ifndef GDB_ASSERT_H
 #define GDB_ASSERT_H


@@ -40,16 +38,19 @@
 #else
 #if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
 #define ASSERT_FUNCTION                __func__
 #else
 #if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
 #define ASSERT_FUNCTION                __func__

-#else
-#define ASSERT_FUNCTION                ((const char *) 0)

 #endif
 #endif
 
 /* This prints an "Assertion failed" message, aksing the user if they
    want to continue, dump core, or just exit.  */
 #endif
 #endif
 
 /* This prints an "Assertion failed" message, aksing the user if they
    want to continue, dump core, or just exit.  */

+#if defined (ASSERT_FUNCTION)
+#define gdb_assert_fail(assertion, file, line, function)                      \
+  internal_error (file, line, _("%s: Assertion `%s' failed."),                   \
+                 function, assertion)
+#else

 #define gdb_assert_fail(assertion, file, line, function)                      \
 #define gdb_assert_fail(assertion, file, line, function)                      \

-  internal_error (file, line, "%s%sAssertion `%s' failed.",                   \
-                 function ? function : "", function ? ": " : "",             \
+  internal_error (file, line, _("Assertion `%s' failed."),                       \

                  assertion)
                  assertion)

+#endif

 
 #endif /* gdb_assert.h */
 
 #endif /* gdb_assert.h */