aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog4
-rw-r--r--gas/as.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 51384a9..b0763de 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-03 Tristan Gingold <gingold@adacore.com>
+
+ * as.h (__PRETTY_FUNCTION__): Use the same definition as bfd/libbfd.h.
+
2009-09-02 Jie Zhang <jie.zhang@analog.com>
* config/bfin-parse.y (value_match): Use int instead of long.
diff --git a/gas/as.h b/gas/as.h
index 9494cd4..7366121 100644
--- a/gas/as.h
+++ b/gas/as.h
@@ -106,7 +106,7 @@ typedef int * va_list;
#undef NDEBUG
#endif
#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6)
-#define __PRETTY_FUNCTION__ ((char*)0)
+#define __PRETTY_FUNCTION__ ((char *) NULL)
#endif
#define gas_assert(P) \
((void) ((P) ? 0 : (as_assert (__FILE__, __LINE__, __PRETTY_FUNCTION__), 0)))