Mercurial > hg > CbC > CbC_gcc

diff gcc/tree.h @ 113:bdf41c9fa0b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove RECTYPE
author mir3636
date Fri, 17 Nov 2017 06:33:55 +0900
parents ab0bcb71f44d
children e234ee7b7292
line wrap: on
line diff
--- a/gcc/tree.h	Fri Nov 10 19:46:38 2017 +0900
+++ b/gcc/tree.h	Fri Nov 17 06:33:55 2017 +0900
@@ -4105,14 +4105,11 @@
 extern bool vec_member (const_tree, vec<tree, va_gc> *);
 extern tree chain_index (int, tree);
 
-<<<<<<< local
-=======
 #ifndef noCbC
 extern tree build_code_segment_type (tree, tree);
 #endif
 extern int attribute_list_equal (const_tree, const_tree);
 extern int attribute_list_contained (const_tree, const_tree);
->>>>>>> other
 extern int tree_int_cst_equal (const_tree, const_tree);
 
 extern bool tree_fits_shwi_p (const_tree)