X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdb_assert.h;h=bc5a8d73a1501d42cc50d9d4c983a08df4647fd2;hb=064f515651b1e730c60652eaf07f94c22841d475;hp=4f0bcdc94978550e983454b34a048e41777cb6e1;hpb=3826677692e9e12fb42bc5cded26960d2137faec;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdb_assert.h b/gdb/gdb_assert.h
index 4f0bcdc949..bc5a8d73a1 100644
--- a/gdb/gdb_assert.h
+++ b/gdb/gdb_assert.h
@@ -1,5 +1,5 @@
 /* GDB-friendly replacement for <assert.h>.
-   Copyright 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef GDB_ASSERT_H
 #define GDB_ASSERT_H
@@ -40,16 +40,19 @@
 #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.  */
+#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)                      \
-  internal_error (file, line, "%s%sAssertion `%s' failed.",                   \
-		  function ? function : "", function ? ": " : "",             \
+  internal_error (file, line, _("Assertion `%s' failed."),                       \
 		  assertion)
+#endif
 
 #endif /* gdb_assert.h */