From 1e87b08a4c89ee453308a0b09b5bc40a5e3bec10 Mon Sep 17 00:00:00 2001
From: bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 14 Nov 2011 14:34:33 +0000
Subject: 2011-11-14  Basile Starynkevitch  <basile@starynkevitch.net>

	MELT branch merged with trunk rev 181350 using svnmerge



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@181351 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/vec.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gcc/vec.h')

diff --git a/gcc/vec.h b/gcc/vec.h
index 789e8e2d4df..d47795879f1 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -549,7 +549,12 @@ typedef struct VEC(T,A)							  \
 } VEC(T,A)
 
 /* Convert to base type.  */
+#if GCC_VERSION >= 4000
+#define VEC_BASE(P) \
+  ((offsetof (__typeof (*P), base) == 0 || (P)) ? &(P)->base : 0)
+#else
 #define VEC_BASE(P)  ((P) ? &(P)->base : 0)
+#endif
 
 /* Vector of integer-like object.  */
 #define DEF_VEC_I(T)							  \
-- 
cgit v1.2.1