From d2e7ac2a73d6bcff5e0c32bced4f407ce06175a0 Mon Sep 17 00:00:00 2001
From: kan <kan@FreeBSD.org>
Date: Sat, 26 Aug 2006 21:37:21 +0000
Subject: Resolve conflicts after GCC 3.4.6 20060825 import.

---
 contrib/gcc/c-common.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'contrib/gcc/c-common.h')

diff --git a/contrib/gcc/c-common.h b/contrib/gcc/c-common.h
index bd8be8b..3466bff 100644
--- a/contrib/gcc/c-common.h
+++ b/contrib/gcc/c-common.h
@@ -1268,6 +1268,8 @@ extern tree finish_label_address_expr (tree);
    different implementations.  Used in c-common.c.  */
 extern tree lookup_label (tree);
 
+extern int vector_types_convertible_p (tree t1, tree t2);
+
 extern rtx c_expand_expr (tree, rtx, enum machine_mode, int, rtx *);
 
 extern int c_safe_from_p (rtx, tree);
-- 
cgit v1.1