In include:

[pf3gnuchains/gcc-fork.git] / gcc / varray.h

diff --git a/gcc/varray.h b/gcc/varray.h
index 4e9b62f..1456ffe 100644 (file)
--- a/gcc/varray.h
+++ b/gcc/varray.h
@@ -176,12 +176,11 @@ extern varray_type varray_grow    PARAMS ((varray_type, size_t));
 extern void varray_check_failed PARAMS ((varray_type, size_t,
                                        const char *, int,
                                        const char *)) ATTRIBUTE_NORETURN;
-#define VARRAY_CHECK(VA, N, T)                                 \
+#define VARRAY_CHECK(VA, N, T) __extension__                   \
 (*({ varray_type _va = VA;                                     \
      size_t _n = N;                                            \
      if (_n >= _va->num_elements)                              \
-       varray_check_failed (_va, _n, __FILE__, __LINE__,       \
-                           __PRETTY_FUNCTION__);               \
+       varray_check_failed (_va, _n, __FILE__, __LINE__, __FUNCTION__);        \
      &_va->data.T[_n]; }))
 #else
 #define VARRAY_CHECK(VA, N, T) ((VA)->data.T[N])
@@ -239,8 +238,8 @@ extern void varray_check_failed PARAMS ((varray_type, size_t,
 #define VARRAY_PUSH_ULONG(VA, X)       VARRAY_PUSH (VA, ul, X)
 #define VARRAY_PUSH_WIDE_INT(VA, X)    VARRAY_PUSH (VA, hint, X)
 #define VARRAY_PUSH_UWIDE_INT(VA, X)   VARRAY_PUSH (VA, uhint, X)
-#define VARRAY_PUSH_GENERIC_PTR(VA,N)  VARRAY_PUSH (VA, generic, X)
-#define VARRAY_PUSH_CHAR_PTR(VA,N)     VARRAY_PUSH (VA, cptr, X)
+#define VARRAY_PUSH_GENERIC_PTR(VA, X) VARRAY_PUSH (VA, generic, X)
+#define VARRAY_PUSH_CHAR_PTR(VA, X)    VARRAY_PUSH (VA, cptr, X)
 #define VARRAY_PUSH_RTX(VA, X)         VARRAY_PUSH (VA, rtx, X)
 #define VARRAY_PUSH_RTVEC(VA, X)       VARRAY_PUSH (VA, rtvec, X)
 #define VARRAY_PUSH_TREE(VA, X)                VARRAY_PUSH (VA, tree, X)